diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
| commit | 197c78fa4bf372d09b315b1bad3cf6649627eb48 (patch) | |
| tree | d49217ad4a9b10fa907cfbefeba1453042b66f9a /indra/newview/llpanelmaininventory.cpp | |
| parent | 05e15ccb82541494bf7145652140de187d838cda (diff) | |
| parent | 367fda833cb5633564c2518f613a00484eb73ec5 (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index a5a61f0c7b..1895993a8e 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1071,7 +1071,11 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata) { const LLUUID &item_id = (*iter); LLFolderViewItem *item = folder->getItemByID(item_id); - can_delete &= item->getListener()->isItemRemovable(); + const LLFolderViewEventListener *listener = item->getListener(); + llassert(listener); + if (!listener) return FALSE; + can_delete &= listener->isItemRemovable(); + can_delete &= !listener->isItemInTrash(); } return can_delete; } |