diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-15 15:56:54 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-15 15:56:54 -0400 |
| commit | f12aa928c557230664666ced9b55ef643bbfb7c2 (patch) | |
| tree | 2e847fec65313e7d6b65fe8ec6e0a90696d02555 /indra/newview | |
| parent | 40133be7bebbf27aa8d2994e558f3b5a6706f2f9 (diff) | |
EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 7ce96a6ac1..413f329ce9 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2581,9 +2581,9 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) mItems.push_back(std::string("New Clothes")); mItems.push_back(std::string("New Body Parts")); - // Changing folder types is just a debug feature; this is fairly unsupported +#if SUPPORT_ENSEMBLES + // Changing folder types is an unfinished unsupported feature // 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())) |