diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-07-22 18:23:48 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-07-22 18:23:48 -0700 |
| commit | f61671aec7a15160f906650b4c7449be68c7b074 (patch) | |
| tree | 1c8f08f04d137f41c5b8cbf9a579161ff0dd3538 /indra/newview/llinventorypanel.cpp | |
| parent | 3d4acb535d75c4cc78c93dee318bcffaca691237 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Merged in release.
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 { |