diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-05-27 14:38:51 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-05-27 14:38:51 -0400 |
| commit | 3fc39776dd7a347870a5005808c69f27413de424 (patch) | |
| tree | 66abaca8dffc18de0cd3ac13a57c410e54ddd294 /indra/newview/llmutelist.h | |
| parent | df55db4aa02ef02169d318b1d8b607c2edb3ba5d (diff) | |
MAINT-5232: Remove dubious polling in LLMuteList::getInstance().
The LLMuteList singleton instance might be requested before gMessageSystem is
constructed. LLMuteList wants to register a couple gMessageSystem callbacks.
Since gMessageSystem is not (yet) itself an LLSingleton, LLMuteList's
constructor can't just call it into existence. Until now, LLMuteList overrode
LLSingleton's getInstance() method: every time getInstance() was called, the
subclass override method would check whether gMessageSystem had been
initialized, and if so, register its callbacks before forwarding the call to
the base-class LLSingleton::getInstance() method.
Change to use LLPounceable::callWhenReady() instead.
This is the reason gMessageSystem was made an LLPounceable.
Diffstat (limited to 'indra/newview/llmutelist.h')
| -rwxr-xr-x | indra/newview/llmutelist.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h index 3e998b4f0e..d315f225bf 100755 --- a/indra/newview/llmutelist.h +++ b/indra/newview/llmutelist.h @@ -84,11 +84,6 @@ 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); |