TCMalloc can now be manually disabled via develop.py -DDISABLE_TCMALLOC:BOOL=ON

2012-10-16 17:15:23 -05:00
parent 1b89e5c973
commit 7533b475be
4 changed files with 12 additions and 10 deletions
--- a/indra/newview/sgmemstat.cpp
+++ b/indra/newview/sgmemstat.cpp
@@ -18,7 +18,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "sgmemstat.h"

-#if (!LL_WINDOWS && !LL_LINUX)
+#if (!(LL_LINUX || LL_USE_TCMALLOC))
 bool SGMemStat::haveStat() {
 	return false;
 }