summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-07-19 21:24:56 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2011-07-19 21:24:56 +0300
commit880a7ebb9298b1cc6b516b894daf4aa09cdc776b (patch)
tree0d5bfb054b09eb1ca1e6448a47f3d9f835bece58 /indra/newview
parent4dc0850da7469906e5ad052da71830b05005295b (diff)
STORM-519 FIXED "Delete" is enabled in the context menu for folders which contain worn items
- Disable "Delete" menu item in case selected folder contains non-removable items.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorybridge.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 75d4c4e80d..9f093b8a34 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2514,6 +2514,11 @@ void LLFolderBridge::folderOptionsMenu()
}
}
+ if (!isItemRemovable())
+ {
+ disabled_items.push_back(std::string("Delete"));
+ }
+
#ifndef LL_RELEASE_FOR_DOWNLOAD
if (LLFolderType::lookupIsProtectedType(type))
{