SH-4300 WIP - removed unused update_base_outfit stuff in updateClothingOrderingInfo()

2 files changed, 19 insertions, 28 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 9c10c20cfe..82d12ae60c 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -435,13 +435,11 @@ private:
 
 S32 LLCallAfterInventoryCopyMgr::sInstanceCount = 0;
 
-LLUpdateAppearanceOnDestroy::LLUpdateAppearanceOnDestroy(bool update_base_outfit_ordering,
-														 bool enforce_item_restrictions,
+LLUpdateAppearanceOnDestroy::LLUpdateAppearanceOnDestroy(bool enforce_item_restrictions,
 														 bool enforce_ordering,
 														 nullary_func_t post_update_func 
 	):
 	mFireCount(0),
-	mUpdateBaseOrder(update_base_outfit_ordering),
 	mEnforceItemRestrictions(enforce_item_restrictions),
 	mEnforceOrdering(enforce_ordering),
 	mPostUpdateFunc(post_update_func)
@@ -468,8 +466,7 @@ LLUpdateAppearanceOnDestroy::~LLUpdateAppearanceOnDestroy()
 
 		selfStopPhase("update_appearance_on_destroy");
 
-		LLAppearanceMgr::instance().updateAppearanceFromCOF(mUpdateBaseOrder,
-															mEnforceItemRestrictions,
+		LLAppearanceMgr::instance().updateAppearanceFromCOF(mEnforceItemRestrictions,
 															mEnforceOrdering,
 															mPostUpdateFunc);
 	}
@@ -503,7 +500,7 @@ LLUpdateAppearanceAndEditWearableOnDestroy::~LLUpdateAppearanceAndEditWearableOn
 	if (!LLApp::isExiting())
 	{
 		LLAppearanceMgr::instance().updateAppearanceFromCOF(
-			false,true,true,
+			true,true,
 			boost::bind(edit_wearable_and_customize_avatar, mItemID));
 	}
 }
@@ -2015,8 +2012,7 @@ void LLAppearanceMgr::enforceCOFItemRestrictions(LLPointer<LLInventoryCallback>
 	}
 }
 
-void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering,
-											  bool enforce_item_restrictions,
+void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
 											  bool enforce_ordering,
 											  nullary_func_t post_update_func)
 {
@@ -2036,7 +2032,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering,
 		// enforce_item_restrictions to false so we don't get
 		// caught in a perpetual loop.
 		LLPointer<LLInventoryCallback> cb(
-			new LLUpdateAppearanceOnDestroy(update_base_outfit_ordering, false, enforce_ordering, post_update_func));
+			new LLUpdateAppearanceOnDestroy(false, enforce_ordering, post_update_func));
 		enforceCOFItemRestrictions(cb);
 		return;
 	}
@@ -2050,8 +2046,8 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering,
 		// to wait for the update callbacks, then (finally!) call
 		// updateAppearanceFromCOF() with no additional COF munging needed.
 		LLPointer<LLInventoryCallback> cb(
-			new LLUpdateAppearanceOnDestroy(false, false, false, post_update_func));
-		updateClothingOrderingInfo(LLUUID::null, update_base_outfit_ordering, cb);
+			new LLUpdateAppearanceOnDestroy(false, false, post_update_func));
+		updateClothingOrderingInfo(LLUUID::null, cb);
 		return;
 	}
 
@@ -2938,20 +2934,11 @@ struct WearablesOrderComparator
 };
 
 void LLAppearanceMgr::updateClothingOrderingInfo(LLUUID cat_id,
-												 bool update_base_outfit_ordering,
 												 LLPointer<LLInventoryCallback> cb)
 {
 	if (cat_id.isNull())
 	{
 		cat_id = getCOF();
-		if (update_base_outfit_ordering)
-		{
-			const LLUUID base_outfit_id = getBaseOutfitUUID();
-			if (base_outfit_id.notNull())
-			{
-				updateClothingOrderingInfo(base_outfit_id,false,cb);
-			}
-		}
 	}
 
 	// COF is processed if cat_id is not specified
@@ -3400,7 +3387,7 @@ void LLAppearanceMgr::onOutfitFolderCreated(const LLUUID& folder_id, bool show_p
 	LLPointer<LLInventoryCallback> cb =
 		new LLBoostFuncInventoryCallback(no_op_inventory_func,
 										 boost::bind(&LLAppearanceMgr::onOutfitFolderCreatedAndClothingOrdered,this,folder_id,show_panel));
-	updateClothingOrderingInfo(LLUUID::null, false, cb);
+	updateClothingOrderingInfo(LLUUID::null, cb);
 }
 
 void LLAppearanceMgr::onOutfitFolderCreatedAndClothingOrdered(const LLUUID& folder_id, bool show_panel)
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 4b633ee9bd..59dc598ee5 100755
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -49,8 +49,7 @@ class LLAppearanceMgr: public LLSingleton<LLAppearanceMgr>
 public:
 	typedef std::vector<LLInventoryModel::item_array_t> wearables_by_type_t;
 
-	void updateAppearanceFromCOF(bool update_base_outfit_ordering = false,
-								 bool enforce_item_restrictions = true,
+	void updateAppearanceFromCOF(bool enforce_item_restrictions = true,
 								 bool enforce_ordering = true,
 								 nullary_func_t post_update_func = no_op);
 	bool needToSaveCOF();
@@ -73,7 +72,12 @@ public:
 	void enforceCOFItemRestrictions(LLPointer<LLInventoryCallback> cb);
 
 	S32 getActiveCopyOperations() const;
-	
+
+	// Replace category contents with copied links via the slam_inventory_folder
+	// command (single inventory operation where supported)
+	void slamCategoryLinks(const LLUUID& src_id, const LLUUID& dst_id,
+						   bool include_folder_links, LLPointer<LLInventoryCallback> cb);
+ 
 	// Copy all items and the src category itself.
 	void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id,
 							 LLPointer<LLInventoryCallback> cb);
@@ -186,6 +190,9 @@ public:
 	void removeItemFromAvatar(const LLUUID& item_id);
 
 
+	void onOutfitFolderCreated(const LLUUID& folder_id, bool show_panel);
+	void onOutfitFolderCreatedAndClothingOrdered(const LLUUID& folder_id, bool show_panel);
+
 	void makeNewOutfitLinks(const std::string& new_folder_name,bool show_panel = true);
 
 	bool moveWearable(LLViewerInventoryItem* item, bool closer_to_body);
@@ -198,7 +205,6 @@ public:
 	//Check ordering information on wearables stored in links' descriptions and update if it is invalid
 	// COF is processed if cat_id is not specified
 	void updateClothingOrderingInfo(LLUUID cat_id = LLUUID::null,
-									bool update_base_outfit_ordering = false,
 									LLPointer<LLInventoryCallback> cb = NULL);
 
 	bool isOutfitLocked() { return mOutfitLocked; }
@@ -271,8 +277,7 @@ public:
 class LLUpdateAppearanceOnDestroy: public LLInventoryCallback
 {
 public:
-	LLUpdateAppearanceOnDestroy(bool update_base_outfit_ordering = false,
-								bool enforce_item_restrictions = true,
+	LLUpdateAppearanceOnDestroy(bool enforce_item_restrictions = true,
 								bool enforce_ordering = true,
 								nullary_func_t post_update_func = no_op);
 	virtual ~LLUpdateAppearanceOnDestroy();
@@ -280,7 +285,6 @@ public:
 
 private:
 	U32 mFireCount;
-	bool mUpdateBaseOrder;
 	bool mEnforceItemRestrictions;
 	bool mEnforceOrdering;
 	nullary_func_t mPostUpdateFunc;