Skip to content

Commit 98473aa

Browse files
#3349 keep object selection after showing confirmation dialog
1 parent 97b1ab3 commit 98473aa

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

indra/newview/llviewermenu.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5199,15 +5199,16 @@ void handle_take(bool take_separate)
51995199
// MAINT-290
52005200
// Reason: Showing the confirmation dialog resets object selection, thus there is nothing to derez.
52015201
// Fix: pass selection to the confirm_take, so that selection doesn't "die" after confirmation dialog is opened
5202-
params.functor.function([take_separate](const LLSD &notification, const LLSD &response)
5202+
LLObjectSelectionHandle obj_selection = LLSelectMgr::instance().getSelection();
5203+
params.functor.function([take_separate, obj_selection](const LLSD &notification, const LLSD &response)
52035204
{
52045205
if (take_separate)
52055206
{
5206-
confirm_take_separate(notification, response, LLSelectMgr::instance().getSelection());
5207+
confirm_take_separate(notification, response, obj_selection);
52075208
}
52085209
else
52095210
{
5210-
confirm_take(notification, response, LLSelectMgr::instance().getSelection());
5211+
confirm_take(notification, response, obj_selection);
52115212
}
52125213
});
52135214

0 commit comments

Comments
 (0)