#3757 Disable ability to create folders in individual outfits

This part needs a recheck

1 files changed, 2 insertions, 4 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5bd17d4d5b..4018a89c5a 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2732,7 +2732,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                     is_movable = false;
                     tooltip_msg = LLTrans::getString("TooltipCantMoveOutfitIntoOutfit");
                 }
-                else if ((dest_res == MY_OUTFITS_OUTFIT || dest_res == MY_OUTFITS_SUBOUTFIT) && inv_res == MY_OUTFITS_SUBFOLDER)
+                else if (dest_res == MY_OUTFITS_OUTFIT || dest_res == MY_OUTFITS_SUBOUTFIT)
                 {
                     is_movable = false;
                     tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
@@ -4471,7 +4471,6 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
             if (cat->getPreferredType() == LLFolderType::FT_OUTFIT)
             {
                 // Want some but not all of the items from getClipboardEntries for outfits.
-                items.push_back(std::string("New Outfit Folder"));
                 items.push_back(std::string("Rename"));
                 items.push_back(std::string("thumbnail"));
 
@@ -4496,9 +4495,8 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
                     {
                         // Not inside an outfit, but inside 'my outfits'
                         items.push_back(std::string("New Outfit"));
+                        items.push_back(std::string("New Outfit Folder"));
                     }
-
-                    items.push_back(std::string("New Outfit Folder"));
                     items.push_back(std::string("Rename"));
                     items.push_back(std::string("thumbnail"));