Second Life viewer sources 1.20.2

1 files changed, 6 insertions, 2 deletions

diff --git a/linden/indra/newview/llmutelist.h b/linden/indra/newview/llmutelist.h
index fa85924..e1a87c8 100644
--- a/linden/indra/newview/llmutelist.h
+++ b/linden/indra/newview/llmutelist.h
@@ -79,12 +79,17 @@ public:
         U32                     mFlags; // flags pertaining to this mute entry
 };
 
-class LLMuteList
+class LLMuteList : public LLSingleton<LLMuteList>
 {
 public:
         LLMuteList();
         ~LLMuteList();
 
+        // Implemented locally so that we can perform some delayed initialization. 
+        // Callers should be careful to call this one and not LLSingleton<LLMuteList>::getInstance()
+        // which would circumvent that mechanism. -MG
+        static LLMuteList* getInstance();
+
         void addObserver(LLMuteListObserver* observer);
         void removeObserver(LLMuteListObserver* observer);
 
@@ -170,6 +175,5 @@ public:
         virtual void onChange() = 0;
 };
 
-extern LLMuteList *gMuteListp;
 
 #endif //LL_MUTELIST_H