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

Show both server/voice versions only if mismatched. Otherwise show the longer one.

meow-7.2.2
Howard Stearns 2021-12-22 15:10:50 -08:00
parent 1c2e66e12d
commit 96e0c82341
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llappviewer.cpp
View File

@ -3209,9 +3209,18 @@ LLSD LLAppViewer::getViewerInfo() const
if(LLVoiceClient::getInstance()->voiceEnabled())
{
auto& licenseInfo(LLLicenseInfo::instance());
std::string detailed_version = licenseInfo.getVersion("slvoice");
LLVoiceVersionInfo version = LLVoiceClient::getInstance()->getVersion();
std::ostringstream version_string;
version_string << version.serverType << " " << version.serverVersion << " SLVoice " << licenseInfo.getVersion("slvoice") << std::endl;
if (std::equal(detailed_version.begin(), detailed_version.begin() + version.serverVersion.size(),
version.serverVersion.begin()))
{ // Normal case: Show type and detailed version.
version_string << version.serverType << " " << detailed_version << std::endl;
}
else
{ // Mismatch: Show both versions.
version_string << version.serverVersion << "/" << detailed_version << std::endl;
}
info["VOICE_VERSION"] = version_string.str();
}
else