diff options
author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-02-28 23:19:45 -0800 |
---|---|---|
committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-02-28 23:19:45 -0800 |
commit | 4d04cbad03382dee5cd75a3d06b14299b96d098b (patch) | |
tree | fa2d406f8344854412c86238f34193360f5ca220 /indra/newview/llvoiceclient.cpp | |
parent | 618179a71722e47115a6b021a1eb2be99e46322f (diff) | |
parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r-- | indra/newview/llvoiceclient.cpp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 5c125a236a..503815e2ed 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -200,7 +200,10 @@ void LLVoiceClient::updateSettings() updateMicMuteLogic(); - if (mVoiceModule) mVoiceModule->updateSettings(); + if (mVoiceModule) + { + mVoiceModule->updateSettings(); + } } //-------------------------------------------------- @@ -416,24 +419,36 @@ void LLVoiceClient::setNonSpatialChannel( const std::string &uri, const std::string &credentials) { - if (mVoiceModule) mVoiceModule->setNonSpatialChannel(uri, credentials); + if (mVoiceModule) + { + mVoiceModule->setNonSpatialChannel(uri, credentials); + } } void LLVoiceClient::setSpatialChannel( const std::string &uri, const std::string &credentials) { - if (mVoiceModule) mVoiceModule->setSpatialChannel(uri, credentials); + if (mVoiceModule) + { + mVoiceModule->setSpatialChannel(uri, credentials); + } } void LLVoiceClient::leaveNonSpatialChannel() { - if (mVoiceModule) mVoiceModule->leaveNonSpatialChannel(); + if (mVoiceModule) + { + mVoiceModule->leaveNonSpatialChannel(); + } } void LLVoiceClient::leaveChannel(void) { - if (mVoiceModule) mVoiceModule->leaveChannel(); + if (mVoiceModule) + { + mVoiceModule->leaveChannel(); + } } std::string LLVoiceClient::getCurrentChannel() @@ -519,7 +534,10 @@ bool LLVoiceClient::voiceEnabled() void LLVoiceClient::setVoiceEnabled(bool enabled) { - if (mVoiceModule) mVoiceModule->setVoiceEnabled(enabled); + if (mVoiceModule) + { + mVoiceModule->setVoiceEnabled(enabled); + } } void LLVoiceClient::updateMicMuteLogic() |