diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-01-23 14:05:12 -0800 | 
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-02-08 18:35:21 -0800 | 
| commit | ef90eba410c9357f62c8e5eaf7a0447bcb51d72f (patch) | |
| tree | 75df96168a5a5d4e128a4062b19f75817b333b30 /indra | |
| parent | b5c1f0fd6eda053bd5603cb424d35da4cbd076c5 (diff) | |
OSX build fixes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoicewebrtc.h | 20 | 
2 files changed, 11 insertions, 11 deletions
| diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 0f42c8ea8a..c9180b7e99 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -2062,7 +2062,7 @@ void LLWebRTCVoiceClient::sessionState::shutdownAllConnections()  } -LLWebRTCVoiceClient::sessionStatePtr_t LLWebRTCVoiceClient::addSession(const std::string &channel_id, sessionStatePtr_t &session) +LLWebRTCVoiceClient::sessionStatePtr_t LLWebRTCVoiceClient::addSession(const std::string &channel_id, sessionState::ptr_t session)  {      sessionStatePtr_t existingSession = sessionState::matchSessionByChannelID(channel_id);  	if (!existingSession) diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h index ce4ab9fed6..b2672ac108 100644 --- a/indra/newview/llvoicewebrtc.h +++ b/indra/newview/llvoicewebrtc.h @@ -410,10 +410,10 @@ public:  	{        public:          estateSessionState(); -        virtual bool processConnectionStates() override; +        bool processConnectionStates() override; -		virtual bool isSpatial() { return true; } -        virtual bool isEstate() { return true; } +		bool isSpatial() override { return true; } +        bool isEstate() override { return true; }  	};      class parcelSessionState : public sessionState @@ -421,8 +421,8 @@ public:        public:          parcelSessionState(const std::string& channelID, S32 parcel_local_id); -        virtual bool isSpatial() { return true; } -        virtual bool isEstate() { return false; } +        bool isSpatial() override { return true; } +        bool isEstate() override { return false; }      };      class adhocSessionState : public sessionState @@ -430,8 +430,8 @@ public:        public:          adhocSessionState(const std::string &channelID); -        virtual bool isSpatial() { return false; } -        virtual bool isEstate() { return false; } +        bool isSpatial() override { return false; } +        bool isEstate() override { return false; }      }; @@ -504,7 +504,7 @@ public:      void              sessionEstablished(const LLUUID& region_id);      sessionStatePtr_t findP2PSession(const LLUUID &agent_id); -    sessionStatePtr_t addSession(const std::string &channel_id, sessionStatePtr_t &session); +    sessionStatePtr_t addSession(const std::string &channel_id, sessionState::ptr_t session);      void deleteSession(const sessionStatePtr_t &session);  	// This is called in several places where the session _may_ need to be deleted. @@ -814,14 +814,14 @@ class LLVoiceWebRTCSpatialConnection :      void OnVoiceConnectionRequestSuccess(const LLSD &body);      void OnVoiceConnectionRequestFailure(std::string url, int retries, LLSD body, const LLSD &result); -	bool connectionStateMachine(); +	bool connectionStateMachine() override;  	void sendData(const std::string &data) override;      void setMuteMic(bool muted) override;  	LLUUID getRegionID() { return mRegionID; } -	void shutDown() +	void shutDown() override  	{   		LLMutexLock lock(&mVoiceStateMutex);  		mShutDown = true; | 
