summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-05 19:09:28 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-05 19:09:28 -0400
commit8c5da0552db39ba6031b76ffb08994e53217a559 (patch)
treef4ac194d15a0a58475496543bbb36d587d195b4f /indra/newview/llinventorybridge.cpp
parentfce8bda3b6e502b3de9b6a34279255999478e407 (diff)
parent8675901fa85de600cc1ef7c5263a5906fd2b2811 (diff)
merged .hgtags
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-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))
{