From 5e9e67cb2d1d3dfc82dfe96103270b2341991ddd Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 16 Mar 2007 20:39:40 +0000 Subject: merge -r 59028:59178 maintenance -> release. --- indra/newview/llface.cpp | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'indra/newview/llface.cpp') diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index bb76957da1..6c00874982 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -944,19 +944,26 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, { LLVOVolume* vobj = (LLVOVolume*) (LLViewerObject*) mVObjp; U8 mode = vobj->mTexAnimMode; - if (mode & LLViewerTextureAnim::TRANSLATE) + if (!mode) { - os = ot = 0.f; + clearState(TEXTURE_ANIM); } - if (mode & LLViewerTextureAnim::ROTATE) - { - r = 0.f; - cos_ang = 1.f; - sin_ang = 0.f; - } - if (mode & LLViewerTextureAnim::SCALE) + else { - ms = mt = 1.f; + 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; + } } } -- cgit v1.3