diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-28 10:13:34 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-28 10:13:34 -0500 |
| commit | 5374e544ed5888548bea334bd8ca7ca53372d031 (patch) | |
| tree | b73c80d7cdc6a78ad6caed46b9485f18b3f039a7 /indra/newview/llappviewerwin32.cpp | |
| parent | 8c86a08e72708e96dcf67830518187a00478bbfd (diff) | |
| parent | fb605a047aa1c6b293b9546a06ac800c53d109ba (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index f94c843ad9..647ace7ee3 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -403,11 +403,9 @@ bool LLAppViewerWin32::initHardwareTest() // if (FALSE == gSavedSettings.getBOOL("NoHardwareProbe")) { - BOOL vram_only = !gSavedSettings.getBOOL("ProbeHardwareOnStartup"); - // per DEV-11631 - disable hardware probing for everything // but vram. - vram_only = TRUE; + BOOL vram_only = TRUE; LLSplashScreen::update(LLTrans::getString("StartupDetectingHardware")); |