merge changes for storm-1458

2011-07-25 09:48:57 -04:00 · 2011-07-25 09:48:57 -04:00 · e072806525
parent 578e44d9b8 880a7ebb92
commit e072806525
1 changed files with 5 additions and 0 deletions
--- 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))
 	{