diff options
author | andreykproductengine <akleshchev@productengine.com> | 2015-08-18 16:42:48 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-18 16:42:48 +0300 |
commit | 62d9b8cbf263f93143352a33d2735a36ce5112b6 (patch) | |
tree | f70ee2ecf319f810507a6c66fbd66ba3602c41b1 /indra/newview/llinventoryfunctions.cpp | |
parent | 8d34d1a9c5ae321ce59b20f8673beed0312a41fe (diff) | |
parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) |
Merge downstream code and become version 3.8.4
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 991c567546..6aaf45c35d 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -2591,11 +2591,11 @@ void LLInventoryAction::onItemsRemovalConfirmation(const LLSD& notification, con LLFolderView* folder_root = root.get(); //Need to remove item from DND before item is removed from root folder view //because once removed from root folder view the item is no longer a selected item - LLInventoryAction::removeItemFromDND(folder_root); + removeItemFromDND(folder_root); folder_root->removeSelectedItems(); // Update the marketplace listings that have been affected by the operation - LLInventoryAction::updateMarketplaceFolders(); + updateMarketplaceFolders(); } } |