diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-05-20 12:43:50 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-05-20 12:43:50 +0300 |
| commit | d86a6403ca021de44ad94abb8a499adf0ea016f6 (patch) | |
| tree | 71e087ab7adac87040fcff6d95f0a9f146c0f103 /indra | |
| parent | cdbc220a9748959cb3b33e38f1ece1b6e145f594 (diff) | |
MAINT-5217 FIXED Allow dragging outfit folders to other folders inside 'My outfit'.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 177efc4e79..f4873856d8 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) { |