summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
diff options
context:
space:
mode:
authorHoward Stearns <howard.stearns@gmail.com>2022-01-06 16:33:38 -0800
committerHoward Stearns <howard.stearns@gmail.com>2022-01-06 16:33:38 -0800
commit4dfecb6e1a56ac9bff81c27a46f7b4c4eda0a40f (patch)
tree711e7432bebd0a79f699c8a2e4d48bfb38678cac /indra/newview/llvoicevivox.cpp
parent9ee93d36ba60ddff857e269b2edee67c141e3589 (diff)
SL-13297 - Change names to match coding standard.
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r--indra/newview/llvoicevivox.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 437633da98..456537de28 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4548,7 +4548,7 @@ void LLVivoxVoiceClient::sessionNotificationEvent(std::string &sessionHandle, st
}
}
-void LLVivoxVoiceClient::voiceServiceConnectionStateChangedEvent(int statusCode, std::string &statusString, std::string &buildID)
+void LLVivoxVoiceClient::voiceServiceConnectionStateChangedEvent(int statusCode, std::string &statusString, std::string &build_id)
{
// We don't generally need to process this. However, one occurence is when we first connect, and so it is the
// earliest opportunity to learn what we're connected to.
@@ -4558,11 +4558,11 @@ void LLVivoxVoiceClient::voiceServiceConnectionStateChangedEvent(int statusCode,
"statusString: " << statusString << LL_ENDL;
return;
}
- if (buildID.empty())
+ if (build_id.empty())
{
return;
}
- mVoiceVersion.buildVersion = buildID;
+ mVoiceVersion.mBuildVersion = build_id;
}
void LLVivoxVoiceClient::auxAudioPropertiesEvent(F32 energy)
@@ -7546,7 +7546,7 @@ void LLVivoxProtocolParser::EndTag(const char *tag)
else if (!stricmp("VersionID", tag))
versionID = string;
else if (!stricmp("Version", tag))
- buildID = string;
+ mBuildID = string;
else if (!stricmp("AccountHandle", tag))
accountHandle = string;
else if (!stricmp("State", tag))
@@ -7850,7 +7850,7 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
}
else if (!stricmp(eventTypeCstr, "VoiceServiceConnectionStateChangedEvent"))
{
- LLVivoxVoiceClient::getInstance()->voiceServiceConnectionStateChangedEvent(statusCode, statusString, buildID);
+ LLVivoxVoiceClient::getInstance()->voiceServiceConnectionStateChangedEvent(statusCode, statusString, mBuildID);
}
else if (!stricmp(eventTypeCstr, "AudioDeviceHotSwapEvent"))
{