diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-10-26 14:35:58 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-10-26 14:35:58 -0600 |
| commit | db363104dc4055b7ed15d695b23df99bb33eb1c8 (patch) | |
| tree | 134a9f60b401bae666a464ea0dcb53ee3de4caa0 | |
| parent | fa04683aba24c1a5dc9dabd77b8c5fabef492974 (diff) | |
fix for SH-2586: Texture Memory (MB) preference refuses to set above 128mb (when --noprobe switch is used)
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 15 |
2 files changed, 13 insertions, 6 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")); diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 01eb384872..30e5f51687 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1069,10 +1069,19 @@ S32 LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended) } else { - if (get_recommended) - max_texmem = 128; - else + if (!get_recommended) + { + max_texmem = 512; + } + else if (gSavedSettings.getBOOL("NoHardwareProbe")) //did not do hardware detection at startup + { max_texmem = 512; + } + else + { + max_texmem = 128; + } + llwarns << "VRAM amount not detected, defaulting to " << max_texmem << " MB" << llendl; } |