diff options
| author | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
| commit | 55c25229b79b1755c989e5996c8e8d118f369721 (patch) | |
| tree | 1fa882bc7e11dc8aec031d5e268131809874168a /indra/newview/llappviewerwin32.cpp | |
| parent | b3fcfa16ba8b984163c38904e165052a34be6dab (diff) | |
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index fb726e7c97..143c9cece4 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -320,6 +320,10 @@ bool LLAppViewerWin32::initHardwareTest() { BOOL vram_only = !gSavedSettings.getBOOL("ProbeHardwareOnStartup"); + // per DEV-11631 - disable hardware probing for everything + // but vram. + vram_only = TRUE; + LLSplashScreen::update("Detecting hardware..."); llinfos << "Attempting to poll DirectX for hardware info" << llendl; |