diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
| commit | de62c3378171a69ff9a39f2f626f1b1d33d0763f (patch) | |
| tree | 053883ba8ae6d02460736ed8a786f1913761b00d /indra/newview/llfloaterabout.cpp | |
| parent | 25df7aca29074b6ae7f108c91673be117522bfc9 (diff) | |
| parent | 3ecec85feb4e9878b32f5737ab8e35747360f138 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 56bc4a7933..ef69f39ad2 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -266,18 +266,8 @@ LLSD LLFloaterAbout::getInfo() info["J2C_VERSION"] = LLImageJ2C::getEngineInfo(); bool want_fullname = true; info["AUDIO_DRIVER_VERSION"] = gAudiop ? LLSD(gAudiop->getDriverName(want_fullname)) : LLSD(); - if(LLVoiceClient::getInstance()->voiceEnabled()) - { - LLVoiceVersionInfo version = LLVoiceClient::getInstance()->getVersion(); - std::ostringstream version_string; - version_string << version.serverType << " " << version.serverVersion << std::endl; - info["VOICE_VERSION"] = version_string.str(); - } - else - { - info["VOICE_VERSION"] = LLTrans::getString("NotConnected"); - } - + info["VIVOX_VERSION"] = gVoiceClient ? gVoiceClient->getAPIVersion() : LLTrans::getString("NotConnected"); + // TODO: Implement media plugin version query info["QT_WEBKIT_VERSION"] = "4.6 (version number hard-coded)"; |