summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-03-10 00:42:08 -0600
committerDave Parks <davep@lindenlab.com>2011-03-10 00:42:08 -0600
commitca610bfc82e9f150877efa7e8c4e972d47bce7d4 (patch)
tree8a95ee221ad09ba96cf8cfd987c0e312e59757ea /indra/newview/llappviewerwin32.cpp
parent9044526994bb51b631a9a0cb7d6d6911a15957c6 (diff)
parent5fd953df8fafb769d31688c47cf3f8634f858de5 (diff)
merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r--indra/newview/llappviewerwin32.cpp6
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;