summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-11-18 15:46:21 -0800
committerMerov Linden <merov@lindenlab.com>2014-11-18 15:46:21 -0800
commit171b60d0685d0e70ac02d3a1833d4bafbcbbe874 (patch)
treef61603b3ff946f4825e987635071380e73852597 /indra
parent3513633d86b89127e8d19cc5906ab614bb051560 (diff)
DD-284 : Do not allow the creation of subfolders in stock folders
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llinventorybridge.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ec29ec5896..ec2fa887e0 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3676,6 +3676,10 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
disabled_items.push_back(std::string("Paste"));
disabled_items.push_back(std::string("Delete"));
}
+ else if (getPreferredType() == LLFolderType::FT_MARKETPLACE_STOCK)
+ {
+ disabled_items.push_back(std::string("New Folder"));
+ }
}
if (marketplace_listings_id == mUUID)
{