summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorsimon <none@none>2013-08-01 11:38:17 -0700
committersimon <none@none>2013-08-01 11:38:17 -0700
commit440e576f86bf346bc4120307fcadbfc3a2aa83a9 (patch)
treed3f22793d1c9e71223fc4ff285a0f87abd08256d /indra/newview
parent6db14e3988a1248141d085e5005baa70e48f8172 (diff)
MAINT-2949 : Objects across the sim border do not render when approached. Added
missing code block from previous change as per Dave P's advice
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llface.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index e63e4285e7..9b2b778677 100755
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -842,6 +842,14 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
newMax.setMax(newMax, tv[i]);
}
+ if (!mDrawablep->isActive())
+ { // Shift position for region
+ LLVector4a offset;
+ offset.load3(mDrawablep->getRegion()->getOriginAgent().mV);
+ newMin.add(offset);
+ newMax.add(offset);
+ }
+
LLVector4a t;
t.setAdd(newMin,newMax);
t.mul(0.5f);
@@ -851,7 +859,6 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
t.setSub(newMax,newMin);
mBoundingSphereRadius = t.getLength3().getF32()*0.5f;
-
updateCenterAgent();
}