diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-30 19:50:05 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-30 19:50:05 -0700 |
| commit | 806d09b1143894ad66cea2c228f467e8c39a8adf (patch) | |
| tree | 512bfa5d5a8fe92ac4616fd9169e1c458b0e8b87 /indra/newview/lldrawable.cpp | |
| parent | b06ec66a5d11628905da256e084d0036f39ba529 (diff) | |
Merge 3.5.1 into Materials
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 fe058cf094..8c9fd4152a 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -554,7 +554,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; @@ -1280,7 +1279,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(); |