diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-11-07 13:28:42 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-11-07 13:28:42 -0500 |
| commit | 0755cb098dc10897106879231989718dbf4abb26 (patch) | |
| tree | f34022002eae5a39a5d38bb5a2ade798b184bdea /indra/newview/llappviewerwin32.cpp | |
| parent | 4091e47cf206a41cac7ee440b8fd2e2898006685 (diff) | |
| parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) | |
Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.
Two fairly simple conflicts: dead stats sending code in the
texture fetch code (new llcorehttp library) and the cleanup
code in llappviewer was moved around in 3.4.x.
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); |