summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2012-08-08 14:11:37 +0300
committermaxim_productengine <mnikolenko@productengine.com>2012-08-08 14:11:37 +0300
commitd047042edcb4407689db6b7a218ca16dd3bf12b0 (patch)
treea41054918cd65a4553f445054db798b99b067f6d /indra/newview
parenteafbdb0dfea3b780b3bedced81b225bcc48ebb09 (diff)
MAINT-481 FIXED Disable creating new folders in Favorites folder
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorybridge.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f752c37c2e..6aa55f9183 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3173,6 +3173,7 @@ void LLFolderBridge::buildContextMenuBaseOptions(U32 flags)
const LLUUID trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
const LLUUID lost_and_found_id = model->findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND);
+ const LLUUID favorites = model->findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
if (lost_and_found_id == mUUID)
{
@@ -3186,7 +3187,10 @@ void LLFolderBridge::buildContextMenuBaseOptions(U32 flags)
mDisabledItems.push_back(std::string("New Clothes"));
mDisabledItems.push_back(std::string("New Body Parts"));
}
-
+ if (favorites == mUUID)
+ {
+ mDisabledItems.push_back(std::string("New Folder"));
+ }
if(trash_id == mUUID)
{
// This is the trash.