diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-11 09:28:32 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-11 09:28:32 -0500 |
| commit | e0759c82be89963c105fbc906ce219d1e922a636 (patch) | |
| tree | 572f06d8f2b96fa600186d4b67d181485e284b02 /indra/newview/llappviewerwin32.cpp | |
| parent | 4b36aeb9736fb71de7087063444652c9d87f370c (diff) | |
| parent | 5fa125ea0b733b3729208d90777d260db5e331e8 (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")); |