diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-12 21:14:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 21:14:45 +0200 |
| commit | 6b285674bba145dd70b90a06248ba8dd7fdc474a (patch) | |
| tree | 110015e1703b331715fbf7fb1a01639c74c47e62 /indra/newview/llimview.h | |
| parent | 748c0eb50d87a3f8895b25791409ce5e2e4926c4 (diff) | |
| parent | eb1ed3896fd82d4f115b2ef6ba742315ad32cc27 (diff) | |
Merge main into DRTVWR-600-maint-A
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 74f6de3a98..7763e79ecf 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -537,7 +537,7 @@ public: static void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction, bool ended_by_agent); private: - void initSingleton(); + void initSingleton() override; void onVoiceChannelChangedInt(const LLUUID &session_id); void onVoiceChannelStateChangedInt(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction, bool ended_by_agent); |