SL-14303 Fix LLWearableType to not spam in logs

5 files changed, 83 insertions, 105 deletions

diff --git a/indra/llappearance/llviewervisualparam.cpp b/indra/llappearance/llviewervisualparam.cpp
index af8394b60c..fb0d12f0af 100644
--- a/indra/llappearance/llviewervisualparam.cpp
+++ b/indra/llappearance/llviewervisualparam.cpp
@@ -70,7 +70,7 @@ BOOL LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node)
 	static LLStdStringHandle wearable_string = LLXmlTree::addAttributeString("wearable");
 	if( node->getFastAttributeString( wearable_string, wearable) )
 	{
-		mWearableType = LLWearableType::typeNameToType( wearable );
+		mWearableType = LLWearableType::getInstance()->typeNameToType( wearable );
 	}
 
 	static LLStdStringHandle edit_group_string = LLXmlTree::addAttributeString("edit_group");
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
index 6079913a8e..e8df3d19f6 100644
--- a/indra/llappearance/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -73,17 +73,17 @@ LLWearable::~LLWearable()
 
 const std::string& LLWearable::getTypeLabel() const
 {
-	return LLWearableType::getTypeLabel(mType);
+	return LLWearableType::getInstance()->getTypeLabel(mType);
 }
 
 const std::string& LLWearable::getTypeName() const
 {
-	return LLWearableType::getTypeName(mType);
+	return LLWearableType::getInstance()->getTypeName(mType);
 }
 
 LLAssetType::EType LLWearable::getAssetType() const
 {
-	return LLWearableType::getAssetType(mType);
+	return LLWearableType::getInstance()->getAssetType(mType);
 }
 
 BOOL LLWearable::exportFile(const std::string& filename) const
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp
index 2bf3b9085b..9cc65dc2ce 100644
--- a/indra/llappearance/llwearabledata.cpp
+++ b/indra/llappearance/llwearabledata.cpp
@@ -231,10 +231,11 @@ BOOL LLWearableData::getWearableIndex(const LLWearable *wearable, U32& index_fou
 U32 LLWearableData::getClothingLayerCount() const
 {
 	U32 count = 0;
+    LLWearableType *wr_inst = LLWearableType::getInstance();
 	for (S32 i = 0; i < LLWearableType::WT_COUNT; i++)
 	{
 		LLWearableType::EType type = (LLWearableType::EType)i;
-		if (LLWearableType::getAssetType(type)==LLAssetType::AT_CLOTHING)
+		if (wr_inst->getAssetType(type)==LLAssetType::AT_CLOTHING)
 		{
 			count += getWearableCount(type);
 		}
@@ -244,7 +245,7 @@ U32 LLWearableData::getClothingLayerCount() const
 
 BOOL LLWearableData::canAddWearable(const LLWearableType::EType type) const
 {
-	LLAssetType::EType a_type = LLWearableType::getAssetType(type);
+    LLAssetType::EType a_type = LLWearableType::getInstance()->getAssetType(type);
 	if (a_type==LLAssetType::AT_CLOTHING)
 	{
 		return (getClothingLayerCount() < MAX_CLOTHING_LAYERS);
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp
index 281060d01d..4ac611b1de 100644
--- a/indra/llappearance/llwearabletype.cpp
+++ b/indra/llappearance/llwearabletype.cpp
@@ -30,153 +30,98 @@
 #include "llinventorydefines.h"
 
 
-struct WearableEntry : public LLDictionaryEntry
+LLWearableType::LLWearableDictionary::LLWearableDictionary(LLTranslationBridge::ptr_t& trans)
 {
-	WearableEntry(LLWearableType& wtype,
-				  const std::string &name,
-				  const std::string& default_new_name,
-				  LLAssetType::EType assetType,
-				  LLInventoryType::EIconName iconName,
-				  BOOL disable_camera_switch = FALSE,
-				  BOOL allow_multiwear = TRUE) :
-		LLDictionaryEntry(name),
-		mAssetType(assetType),
-		mDefaultNewName(default_new_name),
-		mLabel(wtype.mTrans->getString(name)),
-		mIconName(iconName),
-		mDisableCameraSwitch(disable_camera_switch),
-		mAllowMultiwear(allow_multiwear)
-	{
-		
-	}
-	const LLAssetType::EType mAssetType;
-	const std::string mLabel;
-	const std::string mDefaultNewName; //keep mLabel for backward compatibility
-	LLInventoryType::EIconName mIconName;
-	BOOL mDisableCameraSwitch;
-	BOOL mAllowMultiwear;
-};
-
-class LLWearableDictionary : public LLParamSingleton<LLWearableDictionary>,
-							 public LLDictionary<LLWearableType::EType, WearableEntry>
-{
-	LLSINGLETON(LLWearableDictionary, LLWearableType&);
-};
-
-LLWearableDictionary::LLWearableDictionary(LLWearableType& wtype)
-{
-	addEntry(LLWearableType::WT_SHAPE,        new WearableEntry(wtype, "shape",       "New Shape",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_SHAPE, FALSE, FALSE));
-	addEntry(LLWearableType::WT_SKIN,         new WearableEntry(wtype, "skin",        "New Skin",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_SKIN, FALSE, FALSE));
-	addEntry(LLWearableType::WT_HAIR,         new WearableEntry(wtype, "hair",        "New Hair",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_HAIR, FALSE, FALSE));
-	addEntry(LLWearableType::WT_EYES,         new WearableEntry(wtype, "eyes",        "New Eyes",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_EYES, FALSE, FALSE));
-	addEntry(LLWearableType::WT_SHIRT,        new WearableEntry(wtype, "shirt",       "New Shirt",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SHIRT, FALSE, TRUE));
-	addEntry(LLWearableType::WT_PANTS,        new WearableEntry(wtype, "pants",       "New Pants",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PANTS, FALSE, TRUE));
-	addEntry(LLWearableType::WT_SHOES,        new WearableEntry(wtype, "shoes",       "New Shoes",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SHOES, FALSE, TRUE));
-	addEntry(LLWearableType::WT_SOCKS,        new WearableEntry(wtype, "socks",       "New Socks",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SOCKS, FALSE, TRUE));
-	addEntry(LLWearableType::WT_JACKET,       new WearableEntry(wtype, "jacket",      "New Jacket",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_JACKET, FALSE, TRUE));
-	addEntry(LLWearableType::WT_GLOVES,       new WearableEntry(wtype, "gloves",      "New Gloves",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_GLOVES, FALSE, TRUE));
-	addEntry(LLWearableType::WT_UNDERSHIRT,   new WearableEntry(wtype, "undershirt",  "New Undershirt",	LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_UNDERSHIRT, FALSE, TRUE));
-	addEntry(LLWearableType::WT_UNDERPANTS,   new WearableEntry(wtype, "underpants",  "New Underpants",	LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_UNDERPANTS, FALSE, TRUE));
-	addEntry(LLWearableType::WT_SKIRT,        new WearableEntry(wtype, "skirt",       "New Skirt",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SKIRT, FALSE, TRUE));
-	addEntry(LLWearableType::WT_ALPHA,        new WearableEntry(wtype, "alpha",       "New Alpha",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_ALPHA, FALSE, TRUE));
-	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry(wtype, "tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_TATTOO, FALSE, TRUE));
-	addEntry(LLWearableType::WT_UNIVERSAL,    new WearableEntry(wtype, "universal",   "New Universal",     LLAssetType::AT_CLOTHING,   LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL, FALSE, TRUE));
-
-	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry(wtype, "physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
-
-	addEntry(LLWearableType::WT_INVALID,      new WearableEntry(wtype, "invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_UNKNOWN, FALSE, FALSE));
-	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry(wtype, "none",        "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_NONE, FALSE, FALSE));
+	addEntry(LLWearableType::WT_SHAPE,        new WearableEntry(trans, "shape",       "New Shape",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_SHAPE, FALSE, FALSE));
+	addEntry(LLWearableType::WT_SKIN,         new WearableEntry(trans, "skin",        "New Skin",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_SKIN, FALSE, FALSE));
+	addEntry(LLWearableType::WT_HAIR,         new WearableEntry(trans, "hair",        "New Hair",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_HAIR, FALSE, FALSE));
+	addEntry(LLWearableType::WT_EYES,         new WearableEntry(trans, "eyes",        "New Eyes",			LLAssetType::AT_BODYPART, 	LLInventoryType::ICONNAME_BODYPART_EYES, FALSE, FALSE));
+	addEntry(LLWearableType::WT_SHIRT,        new WearableEntry(trans, "shirt",       "New Shirt",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SHIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_PANTS,        new WearableEntry(trans, "pants",       "New Pants",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PANTS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SHOES,        new WearableEntry(trans, "shoes",       "New Shoes",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SHOES, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SOCKS,        new WearableEntry(trans, "socks",       "New Socks",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SOCKS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_JACKET,       new WearableEntry(trans, "jacket",      "New Jacket",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_JACKET, FALSE, TRUE));
+	addEntry(LLWearableType::WT_GLOVES,       new WearableEntry(trans, "gloves",      "New Gloves",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_GLOVES, FALSE, TRUE));
+	addEntry(LLWearableType::WT_UNDERSHIRT,   new WearableEntry(trans, "undershirt",  "New Undershirt",	LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_UNDERSHIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_UNDERPANTS,   new WearableEntry(trans, "underpants",  "New Underpants",	LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_UNDERPANTS, FALSE, TRUE));
+	addEntry(LLWearableType::WT_SKIRT,        new WearableEntry(trans, "skirt",       "New Skirt",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_SKIRT, FALSE, TRUE));
+	addEntry(LLWearableType::WT_ALPHA,        new WearableEntry(trans, "alpha",       "New Alpha",			LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_ALPHA, FALSE, TRUE));
+	addEntry(LLWearableType::WT_TATTOO,       new WearableEntry(trans, "tattoo",      "New Tattoo",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_TATTOO, FALSE, TRUE));
+	addEntry(LLWearableType::WT_UNIVERSAL,    new WearableEntry(trans, "universal",   "New Universal",     LLAssetType::AT_CLOTHING,   LLInventoryType::ICONNAME_CLOTHING_UNIVERSAL, FALSE, TRUE));
+
+	addEntry(LLWearableType::WT_PHYSICS,      new WearableEntry(trans, "physics",     "New Physics",		LLAssetType::AT_CLOTHING, 	LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
+
+	addEntry(LLWearableType::WT_INVALID,      new WearableEntry(trans, "invalid",     "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_UNKNOWN, FALSE, FALSE));
+	addEntry(LLWearableType::WT_NONE,      	  new WearableEntry(trans, "none",        "Invalid Wearable", 	LLAssetType::AT_NONE, 		LLInventoryType::ICONNAME_NONE, FALSE, FALSE));
 }
 
 
 // class LLWearableType
 
-LLWearableType::LLWearableType(LLTranslationBridge* trans)
+LLWearableType::LLWearableType(LLTranslationBridge::ptr_t &trans)
+:   mDictionary(trans)
 {
-    // LLTranslationBridge exists, but is not ready at this point in time since strings.xml is not yet loaded
-    mTrans = trans;
 }
 
 LLWearableType::~LLWearableType()
 {
-    delete mTrans;
 }
 
 void LLWearableType::initSingleton()
 {
-    // To make sure all wrapping functions will crash without initing LLWearableType;
-    LLWearableDictionary::initParamSingleton(*this);
-
-    // Todo: consider merging LLWearableType and LLWearableDictionary
 }
 
-// static
 LLWearableType::EType LLWearableType::typeNameToType(const std::string& type_name)
 {
-	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
-	const LLWearableType::EType wearable = dict->lookup(type_name);
+	const LLWearableType::EType wearable = mDictionary.lookup(type_name);
 	return wearable;
 }
 
-// static 
 const std::string& LLWearableType::getTypeName(LLWearableType::EType type)
 { 
-	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
-	const WearableEntry *entry = dict->lookup(type);
+	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return getTypeName(WT_INVALID);
 	return entry->mName;
 }
 
-//static 
 const std::string& LLWearableType::getTypeDefaultNewName(LLWearableType::EType type)
 { 
-	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
-	const WearableEntry *entry = dict->lookup(type);
+	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return getTypeDefaultNewName(WT_INVALID);
 	return entry->mDefaultNewName;
 }
 
-// static 
 const std::string& LLWearableType::getTypeLabel(LLWearableType::EType type)
 { 
-	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
-	const WearableEntry *entry = dict->lookup(type);
+	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return getTypeLabel(WT_INVALID);
 	return entry->mLabel;
 }
 
-// static 
 LLAssetType::EType LLWearableType::getAssetType(LLWearableType::EType type)
 {
-	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
-	const WearableEntry *entry = dict->lookup(type);
+	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return getAssetType(WT_INVALID);
 	return entry->mAssetType;
 }
 
-// static 
 LLInventoryType::EIconName LLWearableType::getIconName(LLWearableType::EType type)
 {
-	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
-	const WearableEntry *entry = dict->lookup(type);
+	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return getIconName(WT_INVALID);
 	return entry->mIconName;
 } 
 
-// static 
 BOOL LLWearableType::getDisableCameraSwitch(LLWearableType::EType type)
 {
-	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
-	const WearableEntry *entry = dict->lookup(type);
+	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return FALSE;
 	return entry->mDisableCameraSwitch;
 }
 
-// static
 BOOL LLWearableType::getAllowMultiwear(LLWearableType::EType type)
 {
-	const LLWearableDictionary *dict = LLWearableDictionary::getInstance();
-	const WearableEntry *entry = dict->lookup(type);
+	const WearableEntry *entry = mDictionary.lookup(type);
 	if (!entry) return FALSE;
 	return entry->mAllowMultiwear;
 }
diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h
index 57f3ef160d..c83f03e621 100644
--- a/indra/llappearance/llwearabletype.h
+++ b/indra/llappearance/llwearabletype.h
@@ -35,10 +35,9 @@
 
 class LLWearableType : public LLParamSingleton<LLWearableType>
 {
-	LLSINGLETON(LLWearableType, LLTranslationBridge* trans);
+	LLSINGLETON(LLWearableType, LLTranslationBridge::ptr_t &trans);
 	~LLWearableType();
 	void initSingleton();
-	friend struct WearableEntry;
 public: 
 	enum EType
 	{
@@ -67,20 +66,53 @@ public:
 
 	// Most methods are wrappers for dictionary, but if LLWearableType is not initialized,
 	// they will crash. Whole LLWearableType is just wrapper for convinient calls.
-	static const std::string& 			getTypeName(EType type);
-	static const std::string& 			getTypeDefaultNewName(EType type);
-	static const std::string& 			getTypeLabel(EType type);
-	static LLAssetType::EType 			getAssetType(EType type);
-	static EType 						typeNameToType(const std::string& type_name);
-	static LLInventoryType::EIconName 	getIconName(EType type);
-	static BOOL 						getDisableCameraSwitch(EType type);
-	static BOOL 						getAllowMultiwear(EType type);
+	const std::string& 					getTypeName(EType type);
+	const std::string& 					getTypeDefaultNewName(EType type);
+	const std::string& 					getTypeLabel(EType type);
+	LLAssetType::EType 					getAssetType(EType type);
+	EType 								typeNameToType(const std::string& type_name);
+	LLInventoryType::EIconName 			getIconName(EType type);
+	BOOL 								getDisableCameraSwitch(EType type);
+	BOOL 								getAllowMultiwear(EType type);
 
 	static EType						inventoryFlagsToWearableType(U32 flags);
 
-protected:
+private:
+    struct WearableEntry : public LLDictionaryEntry
+    {
+        WearableEntry(LLTranslationBridge::ptr_t& trans,
+            const std::string &name,
+            const std::string& default_new_name,
+            LLAssetType::EType assetType,
+            LLInventoryType::EIconName iconName,
+            BOOL disable_camera_switch = FALSE,
+            BOOL allow_multiwear = TRUE) :
+            LLDictionaryEntry(name),
+            mAssetType(assetType),
+            mDefaultNewName(default_new_name),
+            mLabel(trans->getString(name)),
+            mIconName(iconName),
+            mDisableCameraSwitch(disable_camera_switch),
+            mAllowMultiwear(allow_multiwear)
+        {
 
-	LLTranslationBridge* mTrans;
+        }
+        const LLAssetType::EType mAssetType;
+        const std::string mLabel;
+        const std::string mDefaultNewName; //keep mLabel for backward compatibility
+        LLInventoryType::EIconName mIconName;
+        BOOL mDisableCameraSwitch;
+        BOOL mAllowMultiwear;
+    };
+
+    class LLWearableDictionary : public LLDictionary<LLWearableType::EType, WearableEntry>
+    {
+    public:
+        LLWearableDictionary(LLTranslationBridge::ptr_t& trans);
+        ~LLWearableDictionary() {}
+    };
+
+    LLWearableDictionary mDictionary;
 };
 
 #endif  // LL_LLWEARABLETYPE_H