diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-01-04 13:49:31 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-01-04 13:49:31 +0200 |
| commit | 516e2674f54d400c30bf548ea1e9b0a268bd929f (patch) | |
| tree | e84abb6ea06cde6db9e878fc8d78a6e0b54eed1e /indra/newview/llsidepaneliteminfo.cpp | |
| parent | ed1eb29c7e329fa4de31fdad4272348059462d73 (diff) | |
| parent | 32657e37ab14e3ea4b5ff719e147fd720e895d77 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.cpp')
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 1965e634b6..814508daa9 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -168,11 +168,13 @@ void LLSidepanelItemInfo::refresh() if (getIsEditing()) { setIsEditing(FALSE); - return; } } + + const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); + bool is_editable = item && (item->getUUID() != trash_id) && !gInventory.isObjectDescendentOf(item->getUUID(), trash_id); - if (!getIsEditing() || !item) + if (!getIsEditing() || !is_editable) { const std::string no_item_names[]={ "LabelItemName", @@ -210,7 +212,7 @@ void LLSidepanelItemInfo::refresh() } } - if (!item) + if (!is_editable) { const std::string no_edit_mode_names[]={ "BtnCreator", |