summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-10-24 17:48:12 -0400
committerOz Linden <oz@lindenlab.com>2012-10-24 17:48:12 -0400
commit5db84f89d36e200e3d30952e9d8d193040c36fad (patch)
tree17fb5e4ec073aafc3568cf2759f5ea4d5012972b
parent1b0ea26ecb82b432efd19b319116f94ce58e2b48 (diff)
parent1743e6a81330824021667000f8acdd6cf64dbf1b (diff)
pull back changes (enable tcmalloc) from 3.4.1-beta10
-rwxr-xr-x.hgtags1
-rw-r--r--indra/cmake/GooglePerfTools.cmake2
2 files changed, 2 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index a8f100b446..8d587d5aff 100755
--- a/.hgtags
+++ b/.hgtags
@@ -337,3 +337,4 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179
52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231
464cf7a63a9a2f95bc4972dc022ca765e93de7d3 DRTVWR-233
637fe8bbee5e24940448198c221d5ee0fa3247b4 3.4.1-beta9
+4e0d84e92132e9e95a1d52a1e49bad69c278ea05 3.4.1-beta10
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 73b3642ae6..09501e0406 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -3,7 +3,7 @@ include(Prebuilt)
# If you want to enable or disable TCMALLOC in viewer builds, this is the place.
# set ON or OFF as desired.
-set (USE_TCMALLOC OFF)
+set (USE_TCMALLOC ON)
if (STANDALONE)
include(FindGooglePerfTools)