diff options
author | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
commit | e271c47994fc9dd86bda9d6ad7e79799229e52aa (patch) | |
tree | 39a95ca75541cab5952708b6cfed741394bf9e9c /indra/newview/llinventorybridge.cpp | |
parent | 8cd5d361600f34a0a7fa504a721bea3301191644 (diff) | |
parent | d41202336b7c797bc3fe4feffa8be2164518e845 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 745375fe3d..72c54e5ce2 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3193,16 +3193,8 @@ void LLFolderBridge::pasteFromClipboard() LLViewerInventoryCategory* vicat = (LLViewerInventoryCategory *) model->getCategory(item_id); 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() implicity calls dirtyFilter changeCategoryParent(model, vicat, parent_id, FALSE); } } |