diff options
author | Richard Linden <none@none> | 2011-06-22 19:18:41 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-06-22 19:18:41 -0700 |
commit | ae2cbe5258ad76e22420be2760379480e10fb72c (patch) | |
tree | 360d913b6dfb4b1f64fec70f54cac28a4867cd01 /indra/newview/llinventorypanel.cpp | |
parent | 74e8f5a7c5b4b66d6cebdccee8e592a5600e51a3 (diff) |
EXP-923 FIX Landmarks moved to new folders do not show as moved until relog in viewer - Delete, Copy, and Paste functions not working as well
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r-- | indra/newview/llinventorypanel.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 1ff423056a..49e68402e5 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -463,9 +463,8 @@ void LLInventoryPanel::modelChanged(U32 mask) // This item already exists in both memory and UI. It was probably reparented. if (model_item && view_item) { - // Don't process the item if it's hanging from the root, since its - // model_item's parent will be NULL. - if (view_item->getRoot() != view_item->getParent()) + // Don't process the item if it is the root + if (view_item->getRoot() != view_item) { LLFolderViewFolder* new_parent = (LLFolderViewFolder*)mFolderRoot->getItemByID(model_item->getParentUUID()); // Item has been moved. |