diff options
author | David Walter Seikel | 2014-02-03 15:23:22 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-02-03 15:23:22 +1000 |
commit | d056a17f05a1f90708f554651475e116a2ddbd68 (patch) | |
tree | 07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/lldrawable.cpp | |
parent | Updating tree and volume LOD. These go to eleven. (diff) | |
parent | Fix up OTR prefs to not crash. (diff) | |
download | meta-impy-next.zip meta-impy-next.tar.gz meta-impy-next.tar.bz2 meta-impy-next.tar.xz |
Diffstat (limited to 'linden/indra/newview/lldrawable.cpp')
-rw-r--r-- | linden/indra/newview/lldrawable.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp index 5a383bc..ee49752 100644 --- a/linden/indra/newview/lldrawable.cpp +++ b/linden/indra/newview/lldrawable.cpp | |||
@@ -494,7 +494,6 @@ F32 LLDrawable::updateXform(BOOL undamped) | |||
494 | //scaling | 494 | //scaling |
495 | LLVector3 target_scale = mVObjp->getScale(); | 495 | LLVector3 target_scale = mVObjp->getScale(); |
496 | LLVector3 old_scale = mCurrentScale; | 496 | LLVector3 old_scale = mCurrentScale; |
497 | LLVector3 dest_scale = target_scale; | ||
498 | 497 | ||
499 | // Damping | 498 | // Damping |
500 | F32 dist_squared = 0.f; | 499 | F32 dist_squared = 0.f; |
@@ -834,7 +833,6 @@ const LLVector3* LLDrawable::getSpatialExtents() const | |||
834 | 833 | ||
835 | void LLDrawable::setSpatialExtents(LLVector3 min, LLVector3 max) | 834 | void LLDrawable::setSpatialExtents(LLVector3 min, LLVector3 max) |
836 | { | 835 | { |
837 | LLVector3 size = max - min; | ||
838 | mExtents[0] = min; | 836 | mExtents[0] = min; |
839 | mExtents[1] = max; | 837 | mExtents[1] = max; |
840 | } | 838 | } |
@@ -1098,7 +1096,6 @@ LLCamera LLSpatialBridge::transformCamera(LLCamera& camera) | |||
1098 | LLCamera ret = camera; | 1096 | LLCamera ret = camera; |
1099 | LLXformMatrix* mat = mDrawable->getXform(); | 1097 | LLXformMatrix* mat = mDrawable->getXform(); |
1100 | LLVector3 center = LLVector3(0,0,0) * mat->getWorldMatrix(); | 1098 | LLVector3 center = LLVector3(0,0,0) * mat->getWorldMatrix(); |
1101 | LLQuaternion rotation = LLQuaternion(mat->getWorldMatrix()); | ||
1102 | 1099 | ||
1103 | LLVector3 delta = ret.getOrigin() - center; | 1100 | LLVector3 delta = ret.getOrigin() - center; |
1104 | LLQuaternion rot = ~mat->getRotation(); | 1101 | LLQuaternion rot = ~mat->getRotation(); |