summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-02-10 18:05:07 -0800
committerMerov Linden <merov@lindenlab.com>2012-02-10 18:05:07 -0800
commitd245dad7ddbac36b013c70326ad25eb9247784f6 (patch)
tree2cce7b69f3778b21de7d14e4def746f8ad2bb328 /indra/newview/llinventorypanel.cpp
parent2a4aa438f5798c34f1eef3ef75dc3289492138e1 (diff)
EXP-1863 : Fix the filtering of cut folders, also fix the move to trash of folders in double cut scenarios
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 27f97ad26f..4508e7e083 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -248,8 +248,7 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
getFilter()->setFilterEmptySystemFolders();
}
- // hide items that are on the clipboard
- getFilter()->setFilterClipboard();
+ // keep track of the clipboard state so that we avoid filtering too much
mClipboardState = LLClipboard::getInstance()->getState();
// Initialize base class params.