diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:41:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:41:36 -0500 |
| commit | 1ffd7c99afe25da37a83a2a1dd8a03c7275a5f6b (patch) | |
| tree | ad40ea009c5ebea67dd5334d210d90b6dbeebbd3 /indra/newview/llsidepaneliteminfo.cpp | |
| parent | 202d86b15567a783bed55849a7cdc8ad8d8f874f (diff) | |
| parent | a9609ae1557a70e095088e0a9b6ef5564dfdb388 (diff) | |
automated merge for avp->avp
--HG--
branch : avatar-pipeline
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); + } } |