DRTVWR-476: Fix glitches from lindenlab/viewer master branch merge.

indra/llappearance/llwearabletype.cpp

@@ -57,7 +57,7 @@ struct WearableEntry : public LLDictionaryEntry
 	BOOL mAllowMultiwear;
 };
 
-class LLWearableDictionary : public LLSingleton<LLWearableDictionary>,
+class LLWearableDictionary : public LLParamSingleton<LLWearableDictionary>,
 							 public LLDictionary<LLWearableType::EType, WearableEntry>
 {
 	LLSINGLETON(LLWearableDictionary, LLWearableType&);

indra/llappearance/llwearabletype.h

@@ -46,6 +46,7 @@ class LLWearableType : public LLParamSingleton<LLWearableType>
 {
 	LLSINGLETON(LLWearableType, LLTranslationBridge* trans);
 	~LLWearableType();
+	void initSingleton();
 	friend struct WearableEntry;
 public: 
 	enum EType