livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for merge oversight. take_separate/coalesced now respects param

meow-7.2.2
Beq 2024-09-15 21:06:09 +01:00
parent ec9e5f06ec
commit c0896a239e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewermenu.cpp
View File

@ -6483,7 +6483,17 @@ void handle_take(bool take_separate)
// MAINT-290
// Reason: Showing the confirmation dialog resets object selection, thus there is nothing to derez.
// Fix: pass selection to the confirm_take, so that selection doesn't "die" after confirmation dialog is opened
params.functor.function(boost::bind(confirm_take, _1, _2, LLSelectMgr::instance().getSelection()));
params.functor.function([take_separate](const LLSD &notification, const LLSD &response)
{
if (take_separate)
{
confirm_take_separate(notification, response, LLSelectMgr::instance().getSelection());
}
else
{
confirm_take(notification, response, LLSelectMgr::instance().getSelection());
}
});
if(locked_but_takeable_object ||
!you_own_everything)