diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-04 22:43:55 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-05 16:59:34 +0300 |
| commit | 6fddbeb3973c3cd2135ba101afc13329a8c9fe49 (patch) | |
| tree | 31ce03a1183fb0035c2391671433aaa3d4a70b05 /indra/newview/llmutelist.h | |
| parent | 0b61150e698537a7e42a4cdae02496da500399d9 (diff) | |
SL-12748 Blocked username displays old name after name change
Diffstat (limited to 'indra/newview/llmutelist.h')
| -rw-r--r-- | indra/newview/llmutelist.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h index f2fcf3dbb3..0d426fbd48 100644 --- a/indra/newview/llmutelist.h +++ b/indra/newview/llmutelist.h @@ -73,6 +73,7 @@ class LLMuteList : public LLSingleton<LLMuteList> { LLSINGLETON(LLMuteList); ~LLMuteList(); + /*virtual*/ void cleanupSingleton(); public: // reasons for auto-unmuting a resident enum EAutoReason @@ -131,6 +132,7 @@ private: static void processUseCachedMuteList(LLMessageSystem* msg, void**); static void onFileMuteList(void** user_data, S32 code, LLExtStat ext_status); + void onAccountNameChanged(const LLUUID& id, const std::string& username); private: struct compare_by_name @@ -155,7 +157,9 @@ private: }; typedef std::set<LLMute, compare_by_id> mute_set_t; mute_set_t mMutes; - + typedef std::map<LLUUID, std::string> pending_names_t; + pending_names_t mPendingAgentNameUpdates; + typedef std::set<std::string> string_set_t; string_set_t mLegacyMutes; |