diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-04 18:38:47 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-04 18:38:47 -0500 |
| commit | 14d77a36d4392cd51a0887d957905ce4c532ba38 (patch) | |
| tree | 9dcb08f0ea27a8f7f63a02580ec49ae295342d8a /indra/newview/llappearancemgr.cpp | |
| parent | c25915b39eda279306b8273da4c8ec60fcccb822 (diff) | |
EXT-4993 : Deleting an item from the COF in Inventory Floater keeps it worn
EXT-4997 : Centralize right-click menu options for delete/remove link
EXT-4998 : Automatically reject double separators from right click menu
Disabled/hid delete button from COF right-click menu, also means that trash icon is disabled.
Added generalized function to remove consecutive separators from right-click menu.
Made a minor cosmetic change to have all code duplication for adding "delete" menu item instead call a common function.
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 0fe236c056..326fc41c1e 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1353,6 +1353,11 @@ BOOL LLAppearanceManager::getIsInCOF(const LLUUID& obj_id) const BOOL LLAppearanceManager::getIsProtectedCOFItem(const LLUUID& obj_id) const { if (!getIsInCOF(obj_id)) return FALSE; + + // For now, don't allow direct deletion from the COF. Instead, force users + // to choose "Detach" or "Take Off". + return TRUE; + /* const LLInventoryObject *obj = gInventory.getObject(obj_id); if (!obj) return FALSE; @@ -1363,4 +1368,5 @@ BOOL LLAppearanceManager::getIsProtectedCOFItem(const LLUUID& obj_id) const if (obj->getActualType() == LLAssetType::AT_LINK_FOLDER) return TRUE; return FALSE; + */ } |