From b13b6ef014c251b77a42e40c3fa08ccd05326f16 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 12 Apr 2011 12:07:45 -0500
Subject: [PATCH] New tcmalloc.
---
autobuild.xml | 8 ++++----
indra/llmath/lloctree.h | 10 +---------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index d12bb1d3f75..fee61b7f2d9 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1630,9 +1630,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>cf513fc2eec4a414cc804cf408932a45</string>
+ <string>e2e260409cbd9ac95bfbce929d88accb</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226424/arch/Linux/installer/google_perftools-1.7-linux-20110412.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@@ -1642,9 +1642,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>8308f7bd68bb7083655753b7abe7225f</string>
+ <string>f68604547012e92db912b324c69fbeac</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226287/arch/CYGWIN/installer/google_perftools-1.7-windows-20110411.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226424/arch/CYGWIN/installer/google_perftools-1.7-windows-20110412.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index fdfc24f8b7f..49e84cf1b40 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -580,19 +580,11 @@ class LLOctreeNode : public LLTreeNode<T>
}
protected:
- typedef enum
- {
- CENTER = 0,
- SIZE = 1,
- MAX = 2,
- MIN = 3
- } eDName;
-
LLVector4a mCenter;
LLVector4a mSize;
LLVector4a mMax;
LLVector4a mMin;
-
+
oct_node* mParent;
U8 mOctant;
--
GitLab