summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-10-26 14:35:58 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-10-26 14:35:58 -0600
commitdb363104dc4055b7ed15d695b23df99bb33eb1c8 (patch)
tree134a9f60b401bae666a464ea0dcb53ee3de4caa0 /indra/newview/llappviewerwin32.cpp
parentfa04683aba24c1a5dc9dabd77b8c5fabef492974 (diff)
fix for SH-2586: Texture Memory (MB) preference refuses to set above 128mb (when --noprobe switch is used)
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r--indra/newview/llappviewerwin32.cpp4
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"));