#3757 Smarter subfolders dragndrop

akleshchev · akleshchev · commit ce99ab7a53e3 · 2025-05-07T22:29:31.000+03:00
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
@@ -2664,6 +2664,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
         //
 
         bool is_movable = true;
+        bool create_outfit = false;
 
         if (is_movable && (marketplacelistings_id == cat_id))
         {
@@ -2708,7 +2709,12 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                     tooltip_msg = LLTrans::getString("TooltipOutfitNotInInventory");
                     is_movable = false;
                 }
-                else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))
+                else if (can_move_to_my_outfits_as_outfit(model, inv_cat, max_items_to_wear))
+                {
+                    is_movable = true;
+                    create_outfit = true;
+                }
+                else if (can_move_to_my_outfits_as_subfolder(model, inv_cat))
                 {
                     is_movable = true;
                 }
@@ -2742,7 +2748,12 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                     is_movable = false;
                     tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
                 }
-                else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))
+                else if (can_move_to_my_outfits_as_outfit(model, inv_cat, max_items_to_wear))
+                {
+                    is_movable = true;
+                    create_outfit = true;
+                }
+                else if (can_move_to_my_outfits_as_subfolder(model, inv_cat))
                 {
                     is_movable = true;
                 }
@@ -2943,7 +2954,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
             if (mUUID == my_outifts_id)
             {
                 EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);
-                if (inv_res == MY_OUTFITS_SUBFOLDER || inv_res == MY_OUTFITS_OUTFIT)
+                if (inv_res == MY_OUTFITS_SUBFOLDER || inv_res == MY_OUTFITS_OUTFIT || !create_outfit)
                 {
                     LLInvFVBridge::changeCategoryParent(
                         model,
@@ -2967,7 +2978,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                 {
                 case MY_OUTFITS_NO:
                     // Moning from outside outfits into outfits
-                    if (dest_res == MY_OUTFITS_SUBFOLDER)
+                    if (dest_res == MY_OUTFITS_SUBFOLDER && create_outfit)
                     {
                         // turn it into outfit
                         dropToMyOutfitsSubfolder(inv_cat, mUUID, LLFolderType::FT_OUTFIT, cb);
@@ -4094,7 +4105,6 @@ void LLFolderBridge::perform_pasteFromClipboard()
             LLInventoryObject *obj = model->getObject(item_id);
             if (obj)
             {
-
                 if (move_is_into_lost_and_found)
                 {
                     if (LLAssetType::AT_CATEGORY == obj->getType())
@@ -4111,9 +4121,9 @@ void LLFolderBridge::perform_pasteFromClipboard()
                     }
                     else if (move_is_into_my_outfits && LLAssetType::AT_CATEGORY == obj->getType())
                     {
-                        LLInventoryCategory* cat = model->getCategory(item_id);
+                        LLViewerInventoryCategory* cat = model->getCategory(item_id);
                         U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
-                        if (cat && can_move_to_my_outfits(model, cat, max_items_to_wear))
+                        if (cat && can_move_to_my_outfits_as_outfit(model, cat, max_items_to_wear))
                         {
                             if (mUUID == my_outifts_id)
                             {
@@ -4133,6 +4143,18 @@ void LLFolderBridge::perform_pasteFromClipboard()
                                 }
                             }
                         }
+                        else if (cat && can_move_to_my_outfits_as_subfolder(model, cat))
+                        {
+                            if (LLClipboard::instance().isCutMode())
+                            {
+                                changeCategoryParent(model, cat, parent_id, false);
+                                if (cb) cb->fire(item_id);
+                            }
+                            else
+                            {
+                                copy_inventory_category(model, cat, parent_id);
+                            }
+                        }
                         else
                         {
                             LLNotificationsUtil::add("MyOutfitsPasteFailed");
@@ -4181,7 +4203,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                     // move_inventory_item() is not enough, as we have to update inventory locally too
                     if (LLAssetType::AT_CATEGORY == obj->getType())
                     {
-                        LLViewerInventoryCategory* vicat = (LLViewerInventoryCategory *) model->getCategory(item_id);
+                        LLViewerInventoryCategory* vicat = model->getCategory(item_id);
                         llassert(vicat);
                         if (vicat)
                         {
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
@@ -2314,7 +2314,7 @@ bool can_move_to_landmarks(LLInventoryItem* inv_item)
 }
 
 // Returns true if folder's content can be moved to Current Outfit or any outfit folder.
-bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit)
+bool can_move_to_my_outfits_as_outfit(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit)
 {
     LLInventoryModel::cat_array_t *cats;
     LLInventoryModel::item_array_t *items;
@@ -2353,6 +2353,33 @@ bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_ca
     return true;
 }
 
+bool can_move_to_my_outfits_as_subfolder(LLInventoryModel* model, LLInventoryCategory* inv_cat)
+{
+    LLInventoryModel::cat_array_t* cats;
+    LLInventoryModel::item_array_t* items;
+    model->getDirectDescendentsOf(inv_cat->getUUID(), cats, items);
+
+    if (items->size() > 0)
+    {
+        // subfolders don't allow items
+        return false;
+    }
+
+    for (LLPointer<LLViewerInventoryCategory>& cat : *cats)
+    {
+        // outfits are valid to move, check non-outfit folders
+        if (cat->getPreferredType() != LLFolderType::FT_OUTFIT)
+        {
+            if (!can_move_to_my_outfits_as_subfolder(model, cat))
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
 std::string get_localized_folder_name(LLUUID cat_uuid)
 {
     std::string localized_root_name;
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
@@ -112,7 +112,8 @@ std::string get_category_path(LLUUID cat_id);
 
 bool can_move_to_outfit(LLInventoryItem* inv_item, bool move_is_into_current_outfit);
 bool can_move_to_landmarks(LLInventoryItem* inv_item);
-bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit);
+bool can_move_to_my_outfits_as_outfit(LLInventoryModel* model, LLInventoryCategory* inv_cat, U32 wear_limit);
+bool can_move_to_my_outfits_as_subfolder(LLInventoryModel* model, LLInventoryCategory* inv_cat);
 std::string get_localized_folder_name(LLUUID cat_uuid);
 void new_folder_window(const LLUUID& folder_id);
 void ungroup_folder_items(const LLUUID& folder_id);
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
@@ -3714,6 +3714,7 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
         //
 
         bool is_movable = true;
+        bool create_outfit = false;
 
         if (is_movable && (marketplacelistings_id == cat_id))
         {
@@ -3759,7 +3760,12 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
                     tooltip_msg = LLTrans::getString("TooltipOutfitNotInInventory");
                     is_movable = false;
                 }
-                else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))
+                else if (can_move_to_my_outfits_as_outfit(model, inv_cat, max_items_to_wear))
+                {
+                    is_movable = true;
+                    create_outfit = true;
+                }
+                else if (can_move_to_my_outfits_as_subfolder(model, inv_cat))
                 {
                     is_movable = true;
                 }
@@ -3793,7 +3799,12 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
                     is_movable = false;
                     tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
                 }
-                else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))
+                else if (can_move_to_my_outfits_as_outfit(model, inv_cat, max_items_to_wear))
+                {
+                    is_movable = true;
+                    create_outfit = true;
+                }
+                else if (can_move_to_my_outfits_as_subfolder(model, inv_cat))
                 {
                     is_movable = true;
                 }
@@ -3928,7 +3939,7 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
             if (dest_id == my_outifts_id)
             {
                 EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);
-                if (inv_res == MY_OUTFITS_SUBFOLDER || inv_res == MY_OUTFITS_OUTFIT)
+                if (inv_res == MY_OUTFITS_SUBFOLDER || inv_res == MY_OUTFITS_OUTFIT || !create_outfit)
                 {
                     gInventory.changeCategoryParent(
                         (LLViewerInventoryCategory*)inv_cat,
@@ -3950,7 +3961,7 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
                 {
                 case MY_OUTFITS_NO:
                     // Moning from outside outfits into outfits
-                    if (dest_res == MY_OUTFITS_SUBFOLDER)
+                    if (dest_res == MY_OUTFITS_SUBFOLDER && create_outfit)
                     {
                         // turn it into outfit
                         dropToMyOutfitsSubfolder(inv_cat, dest_id, LLFolderType::FT_OUTFIT);

Original file line number	Diff line number	Diff line change
`@@ -2664,6 +2664,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,`
`2664`	`2664`	`//`
`2665`	`2665`
`2666`	`2666`	`bool is_movable = true;`
	`2667`	`+ bool create_outfit = false;`
`2667`	`2668`
`2668`	`2669`	`if (is_movable && (marketplacelistings_id == cat_id))`
`2669`	`2670`	`{`
`@@ -2708,7 +2709,12 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,`
`2708`	`2709`	`tooltip_msg = LLTrans::getString("TooltipOutfitNotInInventory");`
`2709`	`2710`	`is_movable = false;`
`2710`	`2711`	`}`
`2711`		`- else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))`
	`2712`	`+ else if (can_move_to_my_outfits_as_outfit(model, inv_cat, max_items_to_wear))`
	`2713`	`+ {`
	`2714`	`+ is_movable = true;`
	`2715`	`+ create_outfit = true;`
	`2716`	`+ }`
	`2717`	`+ else if (can_move_to_my_outfits_as_subfolder(model, inv_cat))`
`2712`	`2718`	`{`
`2713`	`2719`	`is_movable = true;`
`2714`	`2720`	`}`
`@@ -2742,7 +2748,12 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,`
`2742`	`2748`	`is_movable = false;`
`2743`	`2749`	`tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");`
`2744`	`2750`	`}`
`2745`		`- else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))`
	`2751`	`+ else if (can_move_to_my_outfits_as_outfit(model, inv_cat, max_items_to_wear))`
	`2752`	`+ {`
	`2753`	`+ is_movable = true;`
	`2754`	`+ create_outfit = true;`
	`2755`	`+ }`
	`2756`	`+ else if (can_move_to_my_outfits_as_subfolder(model, inv_cat))`
`2746`	`2757`	`{`
`2747`	`2758`	`is_movable = true;`
`2748`	`2759`	`}`
`@@ -2943,7 +2954,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,`
`2943`	`2954`	`if (mUUID == my_outifts_id)`
`2944`	`2955`	`{`
`2945`	`2956`	`EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);`
`2946`		`- if (inv_res == MY_OUTFITS_SUBFOLDER \|\| inv_res == MY_OUTFITS_OUTFIT)`
	`2957`	`+ if (inv_res == MY_OUTFITS_SUBFOLDER \|\| inv_res == MY_OUTFITS_OUTFIT \|\| !create_outfit)`
`2947`	`2958`	`{`
`2948`	`2959`	`LLInvFVBridge::changeCategoryParent(`
`2949`	`2960`	`model,`
`@@ -2967,7 +2978,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,`
`2967`	`2978`	`{`
`2968`	`2979`	`case MY_OUTFITS_NO:`
`2969`	`2980`	`// Moning from outside outfits into outfits`
`2970`		`- if (dest_res == MY_OUTFITS_SUBFOLDER)`
	`2981`	`+ if (dest_res == MY_OUTFITS_SUBFOLDER && create_outfit)`
`2971`	`2982`	`{`
`2972`	`2983`	`// turn it into outfit`
`2973`	`2984`	`dropToMyOutfitsSubfolder(inv_cat, mUUID, LLFolderType::FT_OUTFIT, cb);`
`@@ -4094,7 +4105,6 @@ void LLFolderBridge::perform_pasteFromClipboard()`
`4094`	`4105`	`LLInventoryObject *obj = model->getObject(item_id);`
`4095`	`4106`	`if (obj)`
`4096`	`4107`	`{`
`4097`		`-`
`4098`	`4108`	`if (move_is_into_lost_and_found)`
`4099`	`4109`	`{`
`4100`	`4110`	`if (LLAssetType::AT_CATEGORY == obj->getType())`
`@@ -4111,9 +4121,9 @@ void LLFolderBridge::perform_pasteFromClipboard()`
`4111`	`4121`	`}`
`4112`	`4122`	`else if (move_is_into_my_outfits && LLAssetType::AT_CATEGORY == obj->getType())`
`4113`	`4123`	`{`
`4114`		`- LLInventoryCategory* cat = model->getCategory(item_id);`
	`4124`	`+ LLViewerInventoryCategory* cat = model->getCategory(item_id);`
`4115`	`4125`	`U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");`
`4116`		`- if (cat && can_move_to_my_outfits(model, cat, max_items_to_wear))`
	`4126`	`+ if (cat && can_move_to_my_outfits_as_outfit(model, cat, max_items_to_wear))`
`4117`	`4127`	`{`
`4118`	`4128`	`if (mUUID == my_outifts_id)`
`4119`	`4129`	`{`
`@@ -4133,6 +4143,18 @@ void LLFolderBridge::perform_pasteFromClipboard()`
`4133`	`4143`	`}`
`4134`	`4144`	`}`
`4135`	`4145`	`}`
	`4146`	`+ else if (cat && can_move_to_my_outfits_as_subfolder(model, cat))`
	`4147`	`+ {`
	`4148`	`+ if (LLClipboard::instance().isCutMode())`
	`4149`	`+ {`
	`4150`	`+ changeCategoryParent(model, cat, parent_id, false);`
	`4151`	`+ if (cb) cb->fire(item_id);`
	`4152`	`+ }`
	`4153`	`+ else`
	`4154`	`+ {`
	`4155`	`+ copy_inventory_category(model, cat, parent_id);`
	`4156`	`+ }`
	`4157`	`+ }`
`4136`	`4158`	`else`
`4137`	`4159`	`{`
`4138`	`4160`	`LLNotificationsUtil::add("MyOutfitsPasteFailed");`
`@@ -4181,7 +4203,7 @@ void LLFolderBridge::perform_pasteFromClipboard()`
`4181`	`4203`	`// move_inventory_item() is not enough, as we have to update inventory locally too`
`4182`	`4204`	`if (LLAssetType::AT_CATEGORY == obj->getType())`
`4183`	`4205`	`{`
`4184`		`- LLViewerInventoryCategory* vicat = (LLViewerInventoryCategory *) model->getCategory(item_id);`
	`4206`	`+ LLViewerInventoryCategory* vicat = model->getCategory(item_id);`
`4185`	`4207`	`llassert(vicat);`
`4186`	`4208`	`if (vicat)`
`4187`	`4209`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3714,6 +3714,7 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,`
`3714`	`3714`	`//`
`3715`	`3715`
`3716`	`3716`	`bool is_movable = true;`
	`3717`	`+ bool create_outfit = false;`
`3717`	`3718`
`3718`	`3719`	`if (is_movable && (marketplacelistings_id == cat_id))`
`3719`	`3720`	`{`
`@@ -3759,7 +3760,12 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,`
`3759`	`3760`	`tooltip_msg = LLTrans::getString("TooltipOutfitNotInInventory");`
`3760`	`3761`	`is_movable = false;`
`3761`	`3762`	`}`
`3762`		`- else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))`
	`3763`	`+ else if (can_move_to_my_outfits_as_outfit(model, inv_cat, max_items_to_wear))`
	`3764`	`+ {`
	`3765`	`+ is_movable = true;`
	`3766`	`+ create_outfit = true;`
	`3767`	`+ }`
	`3768`	`+ else if (can_move_to_my_outfits_as_subfolder(model, inv_cat))`
`3763`	`3769`	`{`
`3764`	`3770`	`is_movable = true;`
`3765`	`3771`	`}`
`@@ -3793,7 +3799,12 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,`
`3793`	`3799`	`is_movable = false;`
`3794`	`3800`	`tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");`
`3795`	`3801`	`}`
`3796`		`- else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))`
	`3802`	`+ else if (can_move_to_my_outfits_as_outfit(model, inv_cat, max_items_to_wear))`
	`3803`	`+ {`
	`3804`	`+ is_movable = true;`
	`3805`	`+ create_outfit = true;`
	`3806`	`+ }`
	`3807`	`+ else if (can_move_to_my_outfits_as_subfolder(model, inv_cat))`
`3797`	`3808`	`{`
`3798`	`3809`	`is_movable = true;`
`3799`	`3810`	`}`
`@@ -3928,7 +3939,7 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,`
`3928`	`3939`	`if (dest_id == my_outifts_id)`
`3929`	`3940`	`{`
`3930`	`3941`	`EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);`
`3931`		`- if (inv_res == MY_OUTFITS_SUBFOLDER \|\| inv_res == MY_OUTFITS_OUTFIT)`
	`3942`	`+ if (inv_res == MY_OUTFITS_SUBFOLDER \|\| inv_res == MY_OUTFITS_OUTFIT \|\| !create_outfit)`
`3932`	`3943`	`{`
`3933`	`3944`	`gInventory.changeCategoryParent(`
`3934`	`3945`	`(LLViewerInventoryCategory*)inv_cat,`
`@@ -3950,7 +3961,7 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,`
`3950`	`3961`	`{`
`3951`	`3962`	`case MY_OUTFITS_NO:`
`3952`	`3963`	`// Moning from outside outfits into outfits`
`3953`		`- if (dest_res == MY_OUTFITS_SUBFOLDER)`
	`3964`	`+ if (dest_res == MY_OUTFITS_SUBFOLDER && create_outfit)`
`3954`	`3965`	`{`
`3955`	`3966`	`// turn it into outfit`
`3956`	`3967`	`dropToMyOutfitsSubfolder(inv_cat, dest_id, LLFolderType::FT_OUTFIT);`