diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 17:50:26 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 17:50:26 +0200 |
| commit | 166ac89de9bcf951103cbf2551a133ebe9e43035 (patch) | |
| tree | 21f23a3841592edef65f940274b5b59b662e2ba6 /indra/newview/llpanelmaininventory.cpp | |
| parent | ac8753a7eaab05b47d7da6e5ae8ef5f3aa324273 (diff) | |
| parent | 77b5a39cc1daa79ceea599aea3f680127c9949b1 (diff) | |
merge
--HG--
branch : product-engine
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; } |