summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-07-25 11:56:49 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-07-25 11:56:49 -0400
commit6a15da0133aac12f3223d91078d133d50e7d44ee (patch)
treefadafea4c31ed6c56560cd2126214486a231ab6d /indra/newview/llinventorybridge.cpp
parent0e3cea49aaba7fb9e4a75c4a76779ba9273549bf (diff)
parent723d05e6df1d89b8957aca429b1328834f323150 (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))
{