aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterabout.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-05-24 02:59:24 -0500
committerJacek Antonelli2009-05-24 02:59:40 -0500
commitb2627d927f1642bea84b92adfccd9403676e1341 (patch)
tree07f069e63cfa633b9bd0d07b4eecc229ef67f974 /linden/indra/newview/llfloaterabout.cpp
parentSecond Life viewer sources 1.23.1-RC (diff)
downloadmeta-impy-b2627d927f1642bea84b92adfccd9403676e1341.zip
meta-impy-b2627d927f1642bea84b92adfccd9403676e1341.tar.gz
meta-impy-b2627d927f1642bea84b92adfccd9403676e1341.tar.bz2
meta-impy-b2627d927f1642bea84b92adfccd9403676e1341.tar.xz
Second Life viewer sources 1.23.2-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterabout.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 2652387..810799d 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -59,7 +59,11 @@
59#include "llappviewer.h" 59#include "llappviewer.h"
60#include "llglheaders.h" 60#include "llglheaders.h"
61#include "llmediamanager.h" 61#include "llmediamanager.h"
62#include "llwindow.h"
62 63
64#if LL_WINDOWS
65#include "lldxhardware.h"
66#endif
63 67
64extern LLCPUInfo gSysCPU; 68extern LLCPUInfo gSysCPU;
65extern LLMemoryInfo gSysMemory; 69extern LLMemoryInfo gSysMemory;
@@ -193,6 +197,20 @@ LLFloaterAbout::LLFloaterAbout()
193 support.append( (const char*) glGetString(GL_RENDERER) ); 197 support.append( (const char*) glGetString(GL_RENDERER) );
194 support.append("\n"); 198 support.append("\n");
195 199
200#if LL_WINDOWS
201 getWindow()->incBusyCount();
202 getWindow()->setCursor(UI_CURSOR_ARROW);
203 support.append("Windows Graphics Driver Version: ");
204 LLSD driver_info = gDXHardware.getDisplayInfo();
205 if (driver_info.has("DriverVersion"))
206 {
207 support.append(driver_info["DriverVersion"]);
208 }
209 support.append("\n");
210 getWindow()->decBusyCount();
211 getWindow()->setCursor(UI_CURSOR_ARROW);
212#endif
213
196 support.append("OpenGL Version: "); 214 support.append("OpenGL Version: ");
197 support.append( (const char*) glGetString(GL_VERSION) ); 215 support.append( (const char*) glGetString(GL_VERSION) );
198 support.append("\n"); 216 support.append("\n");