summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r--indra/newview/llface.cpp27
1 files changed, 17 insertions, 10 deletions
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;
+ }
}
}