diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
| commit | 8a92612fd976b6e38383d9ee46be5b51053e0998 (patch) | |
| tree | 0c06d99c2b6a8aaa5c78661b488ff8b59b83c523 /indra/newview/llappviewerwin32.cpp | |
| parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
| parent | d6fda15c34896db3b911c3719871ce317edaab1d (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index d328567a0e..6396ca91ff 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -26,12 +26,6 @@ #include "llviewerprecompiledheaders.h" -#if defined(_DEBUG) -# if _MSC_VER >= 1400 // Visual C++ 2005 or later -# define WINDOWS_CRT_MEM_CHECKS 1 -# endif -#endif - #include "llappviewerwin32.h" #include "llmemtype.h" @@ -440,7 +434,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; |