diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-04 20:47:17 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-04 20:47:17 +0200 |
| commit | 67ff38b51b59766ff7bc0af1e541b54ac067ea70 (patch) | |
| tree | d204b5b656911187d12b08b8ed77a873f9758b4d /indra/newview/llsidepaneliteminfo.cpp | |
| parent | c28fd45839b0a1924c80bc289a90e4756e677472 (diff) | |
| parent | ae6911d094bcfaa730fd77f3c55c9ea5fa02b229 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.cpp')
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 5081c33f8e..ad6428e515 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -159,6 +159,7 @@ void LLSidepanelItemInfo::refresh() setIsEditing(FALSE); return; } + mEditBtn->setEnabled(FALSE); } if (!getIsEditing()) @@ -868,7 +869,11 @@ void LLSidepanelItemInfo::updateVerbs() const LLPermissions& perm = item->getPermissions(); BOOL is_modifiable = gAgent.allowOperation(PERM_MODIFY, perm, GP_OBJECT_MANIPULATE); - mEditBtn->setEnabled(is_modifiable); + + const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); + bool item_in_trash = item->getUUID() == trash_id || gInventory.isObjectDescendentOf(item->getUUID(), trash_id); + mEditBtn->setEnabled(is_modifiable && !item_in_trash); + } } |