livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX build fixes

master
Roxie Linden 2024-03-03 16:13:41 -08:00
parent 2117f8c4ba
commit 66d65edbc4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llvoavatar.h
View File

@ -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
** **

8
indra/newview/llvoicechannel.h
View File

@ -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: