livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-13297 - Change names to match coding standard.

master
Howard Stearns 2022-01-06 16:33:38 -08:00
parent 9ee93d36ba
commit 4dfecb6e1a
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llappviewer.cpp
View File

@ -3208,16 +3208,16 @@ LLSD LLAppViewer::getViewerInfo() const
if(LLVoiceClient::getInstance()->voiceEnabled())
{
LLVoiceVersionInfo version = LLVoiceClient::getInstance()->getVersion();
std::string buildVersion = version.buildVersion;
const std::string build_version = version.mBuildVersion;
std::ostringstream version_string;
if (std::equal(buildVersion.begin(), buildVersion.begin() + version.serverVersion.size(),
if (std::equal(build_version.begin(), build_version.begin() + version.serverVersion.size(),
version.serverVersion.begin()))
{ // Normal case: Show type and build version.
version_string << version.serverType << " " << buildVersion << std::endl;
version_string << version.serverType << " " << build_version << std::endl;
}
else
{ // Mismatch: Show both versions.
version_string << version.serverVersion << "/" << buildVersion << std::endl;
version_string << version.serverVersion << "/" << build_version << std::endl;
}
info["VOICE_VERSION"] = version_string.str();
}

2
indra/newview/llvoiceclient.cpp
View File

@ -200,7 +200,7 @@ const LLVoiceVersionInfo LLVoiceClient::getVersion()
LLVoiceVersionInfo result;
result.serverVersion = std::string();
result.serverType = std::string();
result.buildVersion = std::string();
result.mBuildVersion = std::string();
return result;
}
}

2
indra/newview/llvoiceclient.h
View File

@ -95,7 +95,7 @@ struct LLVoiceVersionInfo
{
std::string serverType;
std::string serverVersion;
std::string buildVersion;
std::string mBuildVersion;
};
//////////////////////////////////

10
indra/newview/llvoicevivox.cpp
View File

@ -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"))
{

4
indra/newview/llvoicevivox.h
View File

@ -465,7 +465,7 @@ protected:
void participantAddedEvent(std::string &sessionHandle, std::string &sessionGroupHandle, std::string &uriString, std::string &alias, std::string &nameString, std::string &displayNameString, int participantType);
void participantRemovedEvent(std::string &sessionHandle, std::string &sessionGroupHandle, std::string &uriString, std::string &alias, std::string &nameString);
void participantUpdatedEvent(std::string &sessionHandle, std::string &sessionGroupHandle, std::string &uriString, std::string &alias, bool isModeratorMuted, bool isSpeaking, int volume, F32 energy);
void voiceServiceConnectionStateChangedEvent(int statusCode, std::string &statusString, std::string &buildID);
void voiceServiceConnectionStateChangedEvent(int statusCode, std::string &statusString, std::string &build_id);
void auxAudioPropertiesEvent(F32 energy);
void messageEvent(std::string &sessionHandle, std::string &uriString, std::string &alias, std::string &messageHeader, std::string &messageBody, std::string &applicationString);
void sessionNotificationEvent(std::string &sessionHandle, std::string &uriString, std::string &notificationType);
@ -970,7 +970,7 @@ protected:
std::string actionString;
std::string connectorHandle;
std::string versionID;
std::string buildID;
std::string mBuildID;
std::string accountHandle;
std::string sessionHandle;
std::string sessionGroupHandle;