diff options
author | James Cook <james@lindenlab.com> | 2009-12-09 13:42:07 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-09 13:42:07 -0800 |
commit | 7466aa198a7707f2acadacfb6709bed8351fff96 (patch) | |
tree | 080671ab4d66607d0071e777993f1cb0c6356ec8 /indra/newview/llpanelmaininventory.cpp | |
parent | 1c0b5d4435e30dbfa5865ad212b3ca2a391d43ee (diff) | |
parent | 6260ce6a9210192963a77e5b1f44b0d2c2c86591 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 9fd92725dc..21627e84ff 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1020,6 +1020,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata) can_delete = TRUE; std::set<LLUUID> selection_set; folder->getSelectionList(selection_set); + if (selection_set.empty()) return FALSE; for (std::set<LLUUID>::iterator iter = selection_set.begin(); iter != selection_set.end(); ++iter) |