diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-03 16:56:25 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-03 16:56:25 -0500 |
| commit | f5ade203cb0a714ac8a1f468765838a1d30b0eb6 (patch) | |
| tree | 709daa05a83aadc002f345a8e3273b7f6dcb6433 /indra/newview | |
| parent | 46b2826d653a7e59e89bcffb591567d3ee4c67dd (diff) | |
EXT-4930 : Remove ability to change folder type in release viewer2.0
You should not be able to change folder type in viewer2.0; this was meant as a debug option and I swear it was removed some time ago and crept back in...
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index f68550d8fd..4f02812cc6 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2617,14 +2617,17 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) mItems.push_back(std::string("New Gesture")); mItems.push_back(std::string("New Clothes")); mItems.push_back(std::string("New Body Parts")); - mItems.push_back(std::string("Change Type")); - LLViewerInventoryCategory *cat = getCategory(); + // Changing folder types is just a debug feature; this is fairly unsupported + // and can lead to unexpected behavior if enabled. +#if !LL_RELEASE_FOR_DOWNLOAD + mItems.push_back(std::string("Change Type")); + const LLViewerInventoryCategory *cat = getCategory(); if (cat && LLFolderType::lookupIsProtectedType(cat->getPreferredType())) { mDisabledItems.push_back(std::string("Change Type")); } - +#endif getClipboardEntries(false, mItems, mDisabledItems, flags); } else |