summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorHoward Stearns <howard.stearns@gmail.com>2021-12-30 10:05:52 -0800
committerHoward Stearns <howard.stearns@gmail.com>2022-01-06 15:44:21 -0800
commitbdd8a52dfef293e19da260804f6156a66f05c236 (patch)
tree12064cdeecc05cb1f76309e0e99d55b79a03b5ae /indra/newview/llappviewer.cpp
parent0e94fe645bb7d62ecd2477a7287608a7e5159913 (diff)
SL-13297 - Record and use build version reported by SLVoice
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 58a164f1d0..cebba9158c 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -30,7 +30,6 @@
// Viewer includes
#include "llversioninfo.h"
-#include "lllicenseinfo.h"
#include "llfeaturemanager.h"
#include "lluictrlfactory.h"
#include "lltexteditor.h"
@@ -3208,18 +3207,17 @@ LLSD LLAppViewer::getViewerInfo() const
info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : "Undefined";
if(LLVoiceClient::getInstance()->voiceEnabled())
{
- auto& licenseInfo(LLLicenseInfo::instance());
- std::string detailed_version = licenseInfo.getVersion("slvoice");
LLVoiceVersionInfo version = LLVoiceClient::getInstance()->getVersion();
+ std::string buildVersion = version.buildVersion;
std::ostringstream version_string;
- if (std::equal(detailed_version.begin(), detailed_version.begin() + version.serverVersion.size(),
+ if (std::equal(buildVersion.begin(), buildVersion.begin() + version.serverVersion.size(),
version.serverVersion.begin()))
- { // Normal case: Show type and detailed version.
- version_string << version.serverType << " " << detailed_version << std::endl;
+ { // Normal case: Show type and build version.
+ version_string << version.serverType << " " << buildVersion << std::endl;
}
else
{ // Mismatch: Show both versions.
- version_string << version.serverVersion << "/" << detailed_version << std::endl;
+ version_string << version.serverVersion << "/" << buildVersion << std::endl;
}
info["VOICE_VERSION"] = version_string.str();
}