diff options
| author | username = daianakproductengine <daianakproductengine@lindenlab.com> | 2017-05-19 20:28:59 +0300 |
|---|---|---|
| committer | username = daianakproductengine <daianakproductengine@lindenlab.com> | 2017-05-19 20:28:59 +0300 |
| commit | c9f9e93889ae7400f242db6cc3b01469532c1def (patch) | |
| tree | 3190a9517b47d2950b9f9309bd728cdc33a7114d /indra/newview | |
| parent | aa5b15c940615b52000846b6146f6c90faf480a8 (diff) | |
MAINT-2060 Fixed Double Freeze when clicking on Help>About Second Life
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f53ba01d37..4095f1c8ef 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3347,10 +3347,19 @@ LLSD LLAppViewer::getViewerInfo() const info["GRAPHICS_CARD"] = (const char*)(glGetString(GL_RENDERER)); #if LL_WINDOWS - LLSD driver_info = gDXHardware.getDisplayInfo(); - if (driver_info.has("DriverVersion")) + std::string drvinfo = gDXHardware.getDriverVersionWMI(); + if (!drvinfo.empty()) { - info["GRAPHICS_DRIVER_VERSION"] = driver_info["DriverVersion"]; + info["GRAPHICS_DRIVER_VERSION"] = drvinfo; + } + else + { + LL_WARNS("Driver version")<< "Cannot get driver version from getDriverVersionWMI" << LL_ENDL; + LLSD driver_info = gDXHardware.getDisplayInfo(); + if (driver_info.has("DriverVersion")) + { + info["GRAPHICS_DRIVER_VERSION"] = driver_info["DriverVersion"]; + } } #endif |