From 84a7ec90b306e55740608fe3097b00cef99aec12 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 26 Mar 2020 11:00:52 -0400
Subject: DRTVWR-476: Fix glitches from lindenlab/viewer master branch merge.

---
 indra/llappearance/llwearabletype.cpp | 2 +-
 indra/llappearance/llwearabletype.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp
index 8662345bc4..1ed845e293 100644
--- a/indra/llappearance/llwearabletype.cpp
+++ b/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&);
diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h
index 5fe969822a..8e7c040e1b 100644
--- a/indra/llappearance/llwearabletype.h
+++ b/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
-- 
cgit v1.2.3