summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authordolphin@dolphin-THINK.lindenlab.com <dolphin@dolphin-THINK.lindenlab.com>2012-11-26 08:42:57 -0800
committerdolphin@dolphin-THINK.lindenlab.com <dolphin@dolphin-THINK.lindenlab.com>2012-11-26 08:42:57 -0800
commitbc8b81b16d083cacd6ab4cf45a60cfec9dfc5a8c (patch)
tree64af20bb9cb4d23bd9e4a9d87fb4a43f4a437bd6 /indra/newview/llappviewerwin32.cpp
parent2566e0d08fd7e8a47fc690a8163c1273d91141c2 (diff)
parenta830812172d7eb163c06ead3155dc4b43ded4346 (diff)
Merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r--indra/newview/llappviewerwin32.cpp2
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