summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-18 14:46:32 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-18 14:46:32 -0400
commitba1589d118db0c25f607c74f37834fe8feed9760 (patch)
tree908e3940d8c9624b1b0591567a35b2314ed6277c /indra/newview/llinventorybridge.cpp
parent6c61a537918b5cc73336885f8bdd34943fda2482 (diff)
parentd36a9a7907a1528a8d163577a0770b50e6248802 (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))
{