summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llsidepaneliteminfo.cpp7
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);
+
}
}