diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-02 12:13:52 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-02 12:13:52 -0500 |
| commit | cdf639087011dc7f4510cedd9951e8d890818b97 (patch) | |
| tree | 6d70a6994ab11f0677370dda4f80a205d00660a1 /indra/newview/llfloaterabout.cpp | |
| parent | 7335c6276865061d8b4a549b7cf29f8a8df929a0 (diff) | |
| parent | 3783852444825edf420e6109927df21fd004c3e7 (diff) | |
merging in viewer2 changes
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 63ea990d14..88658f7b9f 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -39,6 +39,7 @@ #include "llagent.h"
#include "llappviewer.h"
#include "llsecondlifeurls.h"
+#include "llvoiceclient.h"
#include "lluictrlfactory.h"
#include "llviewertexteditor.h"
#include "llviewercontrol.h"
@@ -268,6 +269,7 @@ 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";
// TODO: Implement media plugin version query
info["QT_WEBKIT_VERSION"] = "4.5.2";
|