diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-07-22 08:58:31 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-07-22 08:58:31 +0300 |
| commit | 1634f0f46c9efcb187f4a819f992c24a93fe8d9c (patch) | |
| tree | 2f3f08c8976054b821eb96580923369597c5ec80 /indra/newview/llinventorypanel.cpp | |
| parent | 9f5fc6efbd3f3e4418372425734372b5a9bb5d35 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
viewer-release 3.7.13 merge
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rwxr-xr-x | indra/newview/llinventorypanel.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index e74e58015a..a4a85e2e8d 100755 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -547,6 +547,14 @@ void LLInventoryPanel::modelChanged(U32 mask) // Item is to be moved and we found its new parent in the panel's directory, so move the item's UI. view_item->addToFolder(new_parent); addItemID(viewmodel_item->getUUID(), view_item); + if (mInventory) + { + const LLUUID trash_id = mInventory->findCategoryUUIDForType(LLFolderType::FT_TRASH); + if (trash_id != model_item->getParentUUID() && (mask & LLInventoryObserver::INTERNAL) && new_parent->isOpen()) + { + setSelection(item_id, FALSE); + } + } } else { |