From d86a6403ca021de44ad94abb8a499adf0ea016f6 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
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 177efc4e79e..f4873856d81 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2258,8 +2258,14 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
}
if (is_movable && move_is_into_outfit)
{
- 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_current_outfit && is_link)
{
--
GitLab