summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-02-09 23:35:12 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-02-09 23:35:12 +0000
commit5cc44523f79b6cf495d2649fce9bf9e5181787e8 (patch)
treeaf7409521b24318b7c48a7434824178888c17a3e /indra/llmath
parent0009346667872b90d39089c3800ab3e00ce73b51 (diff)
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/lloctree.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 69ff43452c..bea21e22c6 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -170,17 +170,10 @@ public:
static void pushCenter(LLVector3d &center, LLVector3d &size, T* data)
{
- LLVector3 pos(data->getPositionGroup());
- F64 p[] =
- {
- (F64) pos.mV[0],
- (F64) pos.mV[1],
- (F64) pos.mV[2]
- };
-
+ LLVector3d pos(data->getPositionGroup());
for (U32 i = 0; i < 3; i++)
{
- if (p[i] > center.mdV[i])
+ if (pos.mdV[i] > center.mdV[i])
{
center.mdV[i] += size.mdV[i];
}