diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-03-03 22:35:12 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-03-03 22:35:12 -0800 |
| commit | fb0786b9c5d3dfdb0f1d4f7b1383c25741206274 (patch) | |
| tree | d504208e696694c0da899fef333b864b70913ad2 /indra/newview | |
| parent | b17c668d1257ba66e6a0bf84d0ad4c0da785ad64 (diff) | |
| parent | 66d65edbc4da1ac5d4a32224dc77a372e025e5ff (diff) | |
Merge branch 'roxie/webrtc-voice' of github.com:secondlife/viewer-private into roxie/webrtc-voice
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvoicechannel.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 87c9d468a2..a19476153c 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -109,7 +109,7 @@ public: virtual void initInstance(); // Called after construction to initialize the class. protected: virtual ~LLVOAvatar(); - static bool LLVOAvatar::handleVOAvatarPrefsChanged(const LLSD &newvalue); + static bool handleVOAvatarPrefsChanged(const LLSD &newvalue); /** Initialization ** ** diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h index dd24c72891..7ddc6c3e27 100644 --- a/indra/newview/llvoicechannel.h +++ b/indra/newview/llvoicechannel.h @@ -146,7 +146,7 @@ public: void requestChannelInfo() override; protected: - virtual void setState(EState state); + void setState(EState state) override; private: void voiceCallCapCoro(std::string url); @@ -158,7 +158,7 @@ private: class LLVoiceChannelProximal : public LLVoiceChannel, public LLSingleton<LLVoiceChannelProximal> { - LLSINGLETON(LLVoiceChannelProximal); + LLSINGLETON_C11(LLVoiceChannelProximal); public: void onChange(EStatusType status, const LLSD& channelInfo, bool proximal) override; @@ -184,10 +184,10 @@ public: void requestChannelInfo() override; void deactivate() override; - void setChannelInfo(const LLSD& channel_info); + void setChannelInfo(const LLSD& channel_info) override; protected: - virtual void setState(EState state); + void setState(EState state) override; private: |