summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-02-13 13:58:23 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-02-13 13:58:23 +0000
commit2b7966302131975e8d270bbf2985b678f37d4b24 (patch)
tree69d01a92eeaa5de292673bc4506f1d0932d3d607 /indra/newview/llvoiceclient.cpp
parentdec077e54a21ccda7d7cc0b610a87eacfd36af09 (diff)
parent5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff)
merge
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp30
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()