From f0808dbf0f386553b11814ff632c205f554c3059 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 1 Dec 2009 13:08:04 +0000
Subject: [PATCH] version number tweakery in About dialog. vivox 'Unknown' is
the more-descriptive '(Not Connected)' now. plus, we admit that our Qt
version number is hard-coded right into the viewer instead of asking Qt.
---
indra/newview/llfloaterabout.cpp | 4 ++--
indra/newview/llvoiceclient.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 80b0a430e02..e6cae6cccee 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -269,10 +269,10 @@ LLSD LLFloaterAbout::getInfo()
info["J2C_VERSION"] = LLImageJ2C::getEngineInfo();
bool want_fullname = true;
info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : LLSD();
- info["VIVOX_VERSION"] = gVoiceClient ? gVoiceClient->getAPIVersion() : "Unknown";
+ info["VIVOX_VERSION"] = gVoiceClient ? gVoiceClient->getAPIVersion() : "(Not Connected)";
// TODO: Implement media plugin version query
- info["QT_WEBKIT_VERSION"] = "4.5.2";
+ info["QT_WEBKIT_VERSION"] = "4.5.2 (version number hard-coded)";
if (gPacketsIn > 0)
{
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index d677634be69..b39bd442637 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -1162,7 +1162,7 @@ LLVoiceClient::LLVoiceClient() :
mWriteInProgress(false),
mLipSyncEnabled(false),
- mAPIVersion("Unknown")
+ mAPIVersion("(Not Connected)")
{
gVoiceClient = this;
--
GitLab