summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2013-11-05 04:23:12 +0200
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2013-11-05 04:23:12 +0200
commit807383b343333400e70257612f5aee7099453824 (patch)
tree98a4bc1a67cc82ca98bd49954df48712a9e25ece /indra
parentb95935ccf3f15d50a07f3888f13430b5f7951a66 (diff)
MAINT-3376 FIXED Successive llSetTextureAnim calls fail in 3.6.10 (283075) unless a different command (llSleep(0.01), llSay(0,"hello")) is placed between them.:
- fix for MAINT-2861 was reverted to resolve this issue;
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llvovolume.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 5205bc6987..8677c02829 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -334,8 +334,15 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
if (!mTextureAnimp)
{
mTextureAnimp = new LLViewerTextureAnim(this);
- mTexAnimMode = 0;
}
+ else
+ {
+ if (!(mTextureAnimp->mMode & LLTextureAnim::SMOOTH))
+ {
+ mTextureAnimp->reset();
+ }
+ }
+ mTexAnimMode = 0;
mTextureAnimp->unpackTAMessage(mesgsys, block_num);
}