summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-14 09:28:08 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-14 09:28:08 +0100
commitb325f72f7d550fef047e7b85d94fa3f3c778170c (patch)
tree98d06f8ff8d6324d07463d58804fdb4b59616cce /indra/newview/llpanelmaininventory.cpp
parent224892b1d32fe2f4e806736a046e3d0bcde7155d (diff)
parent3ce4cecd681f3f95c7b1fe04db75c384d0b0854e (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index a84280c213..327196d9ba 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1099,8 +1099,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
if (root)
{
can_delete = TRUE;
- std::set<LLUUID> selection_set;
- root->getSelectionList(selection_set);
+ std::set<LLUUID> selection_set = root->getSelectionList();
if (selection_set.empty()) return FALSE;
for (std::set<LLUUID>::iterator iter = selection_set.begin();
iter != selection_set.end();