Commits

Scott Lawrence committed e5c0b14 Merge

merge changes for storm-1458

  • Participants
  • Parent commits e59aaad, 34d7d54

Comments (0)

Files changed (1)

File indra/newview/llinventorybridge.cpp

 		}
 	}
 
+	if (!isItemRemovable())
+	{
+		disabled_items.push_back(std::string("Delete"));
+	}
+
 #ifndef LL_RELEASE_FOR_DOWNLOAD
 	if (LLFolderType::lookupIsProtectedType(type))
 	{