diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
| commit | 19857d0cf0eedb76cac4eb8a1a4a0b33de9e4235 (patch) | |
| tree | 09d6015fedca390d1a259a9911491087cf088df5 /indra/newview/llappviewerwin32.cpp | |
| parent | 120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff) | |
| parent | 4bbfdd4c1fc18162960ba61fbdad40940a4cdd89 (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; |