diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:48:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:48:57 -0400 |
| commit | e0728065251fbd5f45218eb94c056a92162eb54d (patch) | |
| tree | 3d5b0c421df8248cd977de0d56c3bcf4f077c1a2 /indra/newview | |
| parent | 578e44d9b89012d8d4e1352dfd8a2b56b9d58163 (diff) | |
| parent | 880a7ebb9298b1cc6b516b894daf4aa09cdc776b (diff) | |
merge changes for storm-1458
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 |
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)) { |