From bf980bf24bf657def679323e6f368efae46da18a Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 20 May 2015 12:43:50 +0300 Subject: [PATCH] MAINT-5217 FIXED Allow dragging outfit folders to other folders inside 'My outfit'. --- indra/newview/llinventorybridge.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 366d81360a..50d0b287dd 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2595,8 +2595,14 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, } if (is_movable && LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType())) { - is_movable = FALSE; - // tooltip? + if((mUUID == my_outifts_id) || (getCategory() && getCategory()->getPreferredType() == LLFolderType::FT_NONE)) + { + is_movable = ((inv_cat->getPreferredType() == LLFolderType::FT_NONE) || (inv_cat->getPreferredType() == LLFolderType::FT_OUTFIT)); + } + else + { + is_movable = false; + } } if (is_movable && move_is_into_outfit) {