summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-09-18 15:58:54 -0700
committerdolphin <dolphin@lindenlab.com>2013-09-18 15:58:54 -0700
commitd9ad2d3a13b4bb15ab5e56fd04970abc03e100e7 (patch)
tree39178dd2b0ab11d754b57b492b4835b926a538c6 /indra/newview/llface.cpp
parentc8144f7405178621f779b814fd4cb3e632786e0a (diff)
parentad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff)
Merge with 3.6.6-release
Diffstat (limited to 'indra/newview/llface.cpp')
-rwxr-xr-xindra/newview/llface.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 9b2b778677..53e5b55b89 100755
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -821,21 +821,21 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
{
v[i].setSelectWithMask(mask[i], min, max);
}
-
+
LLVector4a tv[8];
-
+
//transform bounding box into drawable space
for (U32 i = 0; i < 8; ++i)
{
mat_vert.affineTransform(v[i], tv[i]);
}
-
+
//find bounding box
LLVector4a& newMin = mExtents[0];
LLVector4a& newMax = mExtents[1];
-
+
newMin = newMax = tv[0];
-
+
for (U32 i = 1; i < 8; ++i)
{
newMin.setMin(newMin, tv[i]);
@@ -851,11 +851,11 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
}
LLVector4a t;
- t.setAdd(newMin,newMax);
+ t.setAdd(newMin, newMax);
t.mul(0.5f);
mCenterLocal.set(t.getF32ptr());
-
+
t.setSub(newMax,newMin);
mBoundingSphereRadius = t.getLength3().getF32()*0.5f;