diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
| commit | 207d9fd767895a3470722fb298eeef4f338e479a (patch) | |
| tree | 050b5c2c1d88b910aeebe8c8be04c19f548bb123 /indra/newview/lldrawable.cpp | |
| parent | 82c92ce5a97d6a83505c775348aef692e18e42ed (diff) | |
| parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) | |
Viewer-chui merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index ba1759f642..fbf0163a70 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -511,7 +511,6 @@ F32 LLDrawable::updateXform(BOOL undamped) //scaling LLVector3 target_scale = mVObjp->getScale(); LLVector3 old_scale = mCurrentScale; - LLVector3 dest_scale = target_scale; // Damping F32 dist_squared = 0.f; @@ -1231,7 +1230,6 @@ LLCamera LLSpatialBridge::transformCamera(LLCamera& camera) LLCamera ret = camera; LLXformMatrix* mat = mDrawable->getXform(); LLVector3 center = LLVector3(0,0,0) * mat->getWorldMatrix(); - LLQuaternion rotation = LLQuaternion(mat->getWorldMatrix()); LLVector3 delta = ret.getOrigin() - center; LLQuaternion rot = ~mat->getRotation(); |