diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-04 15:04:38 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-04 15:04:38 -0800 |
| commit | 53abe3c7802b8c8579ce868b4ecb05d9ebdd20ef (patch) | |
| tree | 4a2c9b325f6ceb75403db9d29e1efa583de434e3 /indra/newview/llsidepaneliteminfo.cpp | |
| parent | 34328eed67a10ccca73ec78cd70488ac35f2ee91 (diff) | |
| parent | 1355d16d2f24f9d623df70059b1f0001cf673209 (diff) | |
Merge
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", |