diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-01-07 17:06:48 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-01-07 17:06:48 +0000 |
| commit | edc641fb0b3bc535d52a600381b3959203c5492b (patch) | |
| tree | 806b049e956922c3a20f99b7bd30307ff7bc15a3 /indra/newview/llappviewer.cpp | |
| parent | 3032ef97a935a1d2cda81c7d89c34c08aa93a5f9 (diff) | |
| parent | a27e418271592f5c3f5a882e4ecea6daf3c6e8c7 (diff) | |
Merged in SL-13297 (pull request #820)
SL-13297 Show both voice versions
Approved-by: Andrey Kleshchev
Approved-by: Andrey Lihatskiy
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 451516610b..f3f74ee3af 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3207,9 +3207,18 @@ LLSD LLAppViewer::getViewerInfo() const info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : "Undefined"; if(LLVoiceClient::getInstance()->voiceEnabled()) { - LLVoiceVersionInfo version = LLVoiceClient::getInstance()->getVersion(); + LLVoiceVersionInfo version = LLVoiceClient::getInstance()->getVersion(); + const std::string build_version = version.mBuildVersion; std::ostringstream version_string; - version_string << version.serverType << " " << version.serverVersion << std::endl; + 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 << " " << build_version << std::endl; + } + else + { // Mismatch: Show both versions. + version_string << version.serverVersion << "/" << build_version << std::endl; + } info["VOICE_VERSION"] = version_string.str(); } else |