diff options
| author | voidpointer <none@none> | 2012-10-18 15:34:43 -0700 |
|---|---|---|
| committer | voidpointer <none@none> | 2012-10-18 15:34:43 -0700 |
| commit | 88fb47bf84b4e995ca36632fc9154cb5a3763def (patch) | |
| tree | ac984df2807dd321508eb2838b2386a215691b59 /indra/newview/llappviewerwin32.cpp | |
| parent | 48b2dbcd65e72994054b9e525c0e45e346a981fb (diff) | |
| parent | 9cc1dfd4e6f3859e690da578adde057ec9a82e18 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 3956e88ced..510ec47a31 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -128,7 +128,9 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, // Note: This won't work when running from the debugger unless the _NO_DEBUG_HEAP environment variable is set to 1 // Enable to get mem debugging within visual studio. - //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); +#if LL_DEBUG + _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); +#else _CrtSetDbgFlag(0); // default, just making explicit ULONG ulEnableLFH = 2; @@ -143,6 +145,7 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, heap_enable_lfh_error[i] = GetLastError(); } #endif +#endif // *FIX: global gIconResource = MAKEINTRESOURCE(IDI_LL_ICON); |