diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-30 16:36:00 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-30 16:36:00 -0500 |
| commit | 11086c06365b8e383bde9abc96341449c72788ad (patch) | |
| tree | 17b8374c3522b2e94a6b6af6391d3bfa7abc0f74 | |
| parent | f4e2287175ab1bc9d09fc73435a828071b9e2ba5 (diff) | |
| parent | 322b5869be76d089187f7a9711273c5fdafe2fe3 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -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", |