diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-14 11:29:02 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-14 11:29:02 -0800 |
| commit | 2f55effd25c035c2af80bd5e6754c96a18f9d7e0 (patch) | |
| tree | 02d2c153b4e40b9770521ee64fb45fd7176b082c /indra/newview/llappviewerwin32.cpp | |
| parent | 7a31a48536f8a373b4e857ca8b906a6984530a04 (diff) | |
| parent | d8e1b48328017eba1c68bcc56a4f67085643988a (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")); |