diff options
| author | Tofu Buzzard <no-email> | 2011-03-10 08:31:04 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-10 08:31:04 -0800 |
| commit | 3dfd3292bfcc39e5545c562b2454e07a939c0322 (patch) | |
| tree | 4e8eec526d36750b0c32f1dd1bc0a37cf38c7f3a /indra/newview/llappviewerwin32.cpp | |
| parent | f2500cd93a8305de950d618551f589cc822d160c (diff) | |
| parent | 9108837ec7088378b99947aae784a7cded69b310 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index d328567a0e..54689ea808 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -440,7 +440,11 @@ bool LLAppViewerWin32::initHardwareTest() LL_WARNS("AppInit") << " Someone took over my exception handler (post hardware probe)!" << LL_ENDL; } - gGLManager.mVRAM = gDXHardware.getVRAM(); + if (gGLManager.mVRAM == 0) + { + gGLManager.mVRAM = gDXHardware.getVRAM(); + } + LL_INFOS("AppInit") << "Detected VRAM: " << gGLManager.mVRAM << LL_ENDL; return true; |