From 66d65edbc4da1ac5d4a32224dc77a372e025e5ff Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Sun, 3 Mar 2024 16:13:41 -0800
Subject: OSX build fixes
---
indra/newview/llvoavatar.h | 2 +-
indra/newview/llvoicechannel.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'indra/newview')
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:
--
cgit v1.2.3