diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 20:44:28 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 20:44:28 +0300 |
| commit | 3e11b8c9172b6967ee9734de2d0493480d483b76 (patch) | |
| tree | 7c10dc25382d842b98eaaf9c251c96d898fe3d12 /indra/newview/llinventoryfunctions.cpp | |
| parent | 666b9346bac49a43ee92390d2dc6cae3ea91cf22 (diff) | |
merge conflict fix (isDead() check got missed)
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 426d9185ef..990343c205 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -2586,7 +2586,7 @@ void LLInventoryAction::removeItemFromDND(LLFolderView* root) void LLInventoryAction::onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFolderView> root) { S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - if (option == 0) + if (option == 0 && !root.isDead() && !root.get()->isDead()) { LLFolderView* folder_root = root.get(); //Need to remove item from DND before item is removed from root folder view |