diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-12 12:27:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-12 12:27:03 -0500 |
| commit | 2027eb8c2bfdc7952fc613f0642192e0c807ec07 (patch) | |
| tree | 67184c85824b39c6bd3e952a7f5b1fc255e102eb | |
| parent | b13b6ef014c251b77a42e40c3fa08ccd05326f16 (diff) | |
Backed out changeset: c5a0cc9abf49
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rw-r--r-- | indra/llmath/lloctree.h | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/autobuild.xml b/autobuild.xml index fee61b7f2d..d12bb1d3f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1630,9 +1630,9 @@ <key>archive</key> <map> <key>hash</key> - <string>e2e260409cbd9ac95bfbce929d88accb</string> + <string>cf513fc2eec4a414cc804cf408932a45</string> <key>url</key> - <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> + <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -1642,9 +1642,9 @@ <key>archive</key> <map> <key>hash</key> - <string>f68604547012e92db912b324c69fbeac</string> + <string>8308f7bd68bb7083655753b7abe7225f</string> <key>url</key> - <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> + <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> </map> <key>name</key> <string>windows</string> diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 49e84cf1b4..fdfc24f8b7 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -580,11 +580,19 @@ public: } 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; |