diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-02 18:36:41 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-02 18:36:41 -0500 |
| commit | 1758e65163e80f88f9c782f9e936e9dbf2f9e296 (patch) | |
| tree | e3b02271ebb1abe78545ad7a3d3f5ea779fdee13 /indra/newview | |
| parent | 9779e6f55a5cfd2846f7fba685e4143666e05d62 (diff) | |
| parent | 86e8c094f1b6bca9c337b9feb2e2726e2a2cf137 (diff) | |
auto merge into viewer 2
Diffstat (limited to 'indra/newview')
| -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); + } } |