summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-03-14 14:01:39 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-03-14 14:01:39 -0700
commit85257154a3ba001ecadacf4d81baa6f9c187a041 (patch)
tree377f6fdffb3e8b479b5ba9f6fb0f80822ee67cc9 /indra/newview/llvovolume.cpp
parentf061b2b90e34d74b9c6db3606babb0402473a24d (diff)
Rollback fix for Maestro 'Jitter Bug' which is causing issues elsewhere
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r--indra/newview/llvovolume.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 3c831bafa0..7adf18b6d0 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1268,7 +1268,7 @@ BOOL LLVOVolume::calcLOD()
else
{
distance = mDrawable->mDistanceWRTCamera;
- radius = getVolume() ? getVolume()->mLODScaleBias.scaledVec(getScale()).length() : getScale().length();
+ radius = getVolume()->mLODScaleBias.scaledVec(getScale()).length();
}
//hold onto unmodified distance for debugging
@@ -2990,8 +2990,7 @@ void LLVOVolume::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_p
//transform view vector into volume space
view_vector -= getRenderPosition();
- // WTF...why is silhouette generation touching a variable used all over the place?!
- //mDrawable->mDistanceWRTCamera = view_vector.length();
+ mDrawable->mDistanceWRTCamera = view_vector.length();
LLQuaternion worldRot = getRenderRotation();
view_vector = view_vector * ~worldRot;
if (!isVolumeGlobal())