diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-03-07 20:27:12 +0200 | 
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-03-07 20:27:12 +0200 | 
| commit | 504509c2882b098997ff4ab2648cc555c2314c2f (patch) | |
| tree | 79b9f5e72173d79aaa89ec9a9d48f6e07c8141fe | |
| parent | 0fb8400e3462ac3585a2af4076d23c20cee8d458 (diff) | |
MAINT-3789 FIXED When moving items between inventory folders, the moved item is no longer highlighted in the new folder.
| -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 d27f7d2527..ed217718c1 100755 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -529,6 +529,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   						{ | 
