diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-30 15:56:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-30 15:56:38 -0400 |
| commit | 74d199c1dd10660f72293c84888af412764f1da8 (patch) | |
| tree | 0b4c4137abde8283c5a85da08f19de1aea335c2a /indra/newview/llappviewerwin32.cpp | |
| parent | 3c3ee709677a0c60420eae84a55a7b61113b4949 (diff) | |
| parent | 6e4e971fd27826f90c1728c7fd17242083e230fc (diff) | |
merge changes for vmrg-233
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 6931b55c4c..bad60a9757 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -26,6 +26,10 @@ #include "llviewerprecompiledheaders.h" +#ifdef INCLUDE_VLD +#include "vld.h" +#endif + #include "llappviewerwin32.h" #include "llmemtype.h" @@ -105,6 +109,14 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow) { +#ifdef INCLUDE_VLD + // only works for debug builds (hard coded into vld.h) + #ifdef _DEBUG + // start with Visual Leak Detector turned off + VLDGlobalDisable(); + #endif // _DEBUG +#endif // INCLUDE_VLD + LLMemType mt1(LLMemType::MTYPE_STARTUP); const S32 MAX_HEAPS = 255; |