diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-09 14:20:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-09 14:20:04 +0800 |
| commit | 2cd3746d2cc4d895ab2662f6f165d674466db093 (patch) | |
| tree | 769eb0ed330712917a45a1b00f64140ba16faf49 /indra/newview/llvoiceclient.cpp | |
| parent | 43d43c79d0254b8b27f2386f67335e5f3dc5d24f (diff) | |
| parent | 735ad360d2fb64246622d53be6ece683fc121a02 (diff) | |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 44bf445522..e36b086f00 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -462,7 +462,7 @@ const LLVoiceDeviceList& LLVoiceClient::getRenderDevices() //-------------------------------------------------- // participants -void LLVoiceClient::getParticipantList(std::set<LLUUID> &participants) +void LLVoiceClient::getParticipantList(std::set<LLUUID> &participants) const { #if !__FreeBSD__ LLWebRTCVoiceClient::getInstance()->getParticipantList(participants); @@ -470,7 +470,7 @@ void LLVoiceClient::getParticipantList(std::set<LLUUID> &participants) LLVivoxVoiceClient::getInstance()->getParticipantList(participants); } -bool LLVoiceClient::isParticipant(const LLUUID &speaker_id) +bool LLVoiceClient::isParticipant(const LLUUID &speaker_id) const { return #if !__FreeBSD__ @@ -791,12 +791,12 @@ void LLVoiceClient::toggleUserPTTState(void) //------------------------------------------- // nearby speaker accessors -BOOL LLVoiceClient::getVoiceEnabled(const LLUUID& id) +bool LLVoiceClient::getVoiceEnabled(const LLUUID& id) const { - return isParticipant(id) ? TRUE : FALSE; + return isParticipant(id); } -std::string LLVoiceClient::getDisplayName(const LLUUID& id) +std::string LLVoiceClient::getDisplayName(const LLUUID& id) const { #if __FreeBSD__ return LLVivoxVoiceClient::getInstance()->getDisplayName(id); |