diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-04 20:12:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-04 20:12:51 -0400 |
| commit | 07899b2820599600fac889355c1742c81d69d051 (patch) | |
| tree | d6166632b77cf4428cbfbf0016c15a85ff87e515 /indra/newview/llappviewerwin32.cpp | |
| parent | 7fe8e87d19f4940d9b682faa7e189d1b1ac18785 (diff) | |
| parent | a5e28651f539ff0f9bb9a678538d70b5fa9f97ba (diff) | |
merge changes for DRTVWR-222
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 53c77fa22e..e0ca1232b0 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -131,7 +131,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; @@ -146,6 +148,7 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, heap_enable_lfh_error[i] = GetLastError(); } #endif +#endif // *FIX: global gIconResource = MAKEINTRESOURCE(IDI_LL_ICON); |