summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-08-23 15:14:04 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-08-23 15:14:04 -0700
commit42701ad3233bfeddf42fb1163f2b83d810b27131 (patch)
tree74d97cc611f60b450ffdbfb88ee92b67b08d8f22
parente50364b22881efecbb75041d48152d61ddbbe6c9 (diff)
CHUI-303: Problem: When pasting the item, the item's filtering flag was not updated. The filtering flag determines visibility. Resolution: Upon pasting the item to the folder from the clipboard, update the filtering flag so that visibility can properly be determined.
-rw-r--r--indra/newview/llinventorybridge.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 215a08b34a..ac9f087d11 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3194,6 +3194,16 @@ void LLFolderBridge::pasteFromClipboard()
llassert(vicat);
if (vicat)
{
+ //Set the pasted folder to dirty, could do this in changeCategoryParent() but only need to set dirty
+ //when pasting from the clipboard. Setting dirty allows updating the filter state, which determines
+ //visibility in the new pasted location.
+
+ LLFolderViewFolder * folderViewItem = mInventoryPanel.get() ? mInventoryPanel.get()->getFolderByID(item_id) : NULL;
+ if(folderViewItem && folderViewItem->getViewModelItem())
+ {
+ folderViewItem->getViewModelItem()->dirtyFilter();
+ }
+
changeCategoryParent(model, vicat, parent_id, FALSE);
}
}
@@ -3203,6 +3213,7 @@ void LLFolderBridge::pasteFromClipboard()
llassert(viitem);
if (viitem)
{
+ //changeItemParent() implicity calls dirtyFilter
changeItemParent(model, viitem, parent_id, FALSE);
}
}