diff options
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index b3e68e24df..b96ffa46fe 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -729,7 +729,18 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f, { size.scaleVec(mDrawablep->getVObj()->getScale()); } - LLQuaternion rotation = LLQuaternion(mat_normal); + + LLMatrix3 mat = mat_normal; + LLVector3 x = mat.getFwdRow(); + LLVector3 y = mat.getLeftRow(); + LLVector3 z = mat.getUpRow(); + x.normVec(); + y.normVec(); + z.normVec(); + + mat.setRows(x,y,z); + + LLQuaternion rotation = LLQuaternion(mat); LLVector3 v[4]; //get 4 corners of bounding box @@ -948,20 +959,11 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } else { - //if (mode & LLViewerTextureAnim::TRANSLATE) - { - os = ot = 0.f; - } - //if (mode & LLViewerTextureAnim::ROTATE) - { - r = 0.f; - cos_ang = 1.f; - sin_ang = 0.f; - } - //if (mode & LLViewerTextureAnim::SCALE) - { - ms = mt = 1.f; - } + os = ot = 0.f; + r = 0.f; + cos_ang = 1.f; + sin_ang = 0.f; + ms = mt = 1.f; } } |