diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-14 10:59:46 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-14 10:59:46 -0800 |
commit | 44737a3992b112c8191593e71533c19e4c10f911 (patch) | |
tree | eb2f965f49bf442939724ed8ec312ad7e3806ac9 /indra/newview/llappviewerwin32.cpp | |
parent | e42755dd16195244a6743fc3970f24fec08f03b9 (diff) | |
parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) |
merging latest changes
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r-- | indra/newview/llappviewerwin32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index e0ca1232b0..11790d562f 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -125,7 +125,7 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, #if WINDOWS_CRT_MEM_CHECKS && !INCLUDE_VLD _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); // dump memory leaks on exit -#elif 1 +#elif 0 // Experimental - enable the low fragmentation heap // This results in a 2-3x improvement in opening a new Inventory window (which uses a large numebr of allocations) // Note: This won't work when running from the debugger unless the _NO_DEBUG_HEAP environment variable is set to 1 |