summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-07 16:14:31 -0600
committerDave Parks <davep@lindenlab.com>2012-11-07 16:14:31 -0600
commitadacf00aadaf9097c2293b6c6b9203b5f4f0c780 (patch)
tree6022511fe314c3ffaa794fef99b213b592ecae96 /indra/newview/llappviewerwin32.cpp
parent42b9001e97298594f79b2145ac13df925d532a6d (diff)
parenta36b66bd145e99a8f597f1c7c3b48ca30bdd7029 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-beta
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