From 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 12 Aug 2008 17:29:50 +0000 Subject: QAR-767 Combined maint-render-7 and maint-viewer-9 merge merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated --- indra/newview/llfloaterabout.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterabout.cpp') diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 9746b06500..2fe1781a96 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -39,6 +39,9 @@ #include "llui.h" // for tr() #include "v3dmath.h" +#include "llcurl.h" +#include "llimagej2c.h" + #include "llviewertexteditor.h" #include "llviewercontrol.h" #include "llagent.h" @@ -113,7 +116,7 @@ LLFloaterAbout::LLFloaterAbout() support.append("\n\n"); } - //*NOTE: Do not translate text like GPU, Graphics Card, etc - + // *NOTE: Do not translate text like GPU, Graphics Card, etc - // Most PC users that know what these mean will be used to the english versions, // and this info sometimes gets sent to support @@ -144,6 +147,16 @@ LLFloaterAbout::LLFloaterAbout() support.append( (const char*) glGetString(GL_VERSION) ); support.append("\n"); + support.append("\n"); + + support.append("libcurl Version: "); + support.append( LLCurl::getVersionString() ); + support.append("\n"); + + support.append("J2C Decoder Version: "); + support.append( LLImageJ2C::getEngineInfo() ); + support.append("\n"); + LLMediaManager *mgr = LLMediaManager::getInstance(); if (mgr) { -- cgit v1.3