diff options
| -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  | 
