summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAnsariel <none@none>2013-08-22 00:51:15 +0200
committerAnsariel <none@none>2013-08-22 00:51:15 +0200
commitbe07694b9cc8d2203cfedc777bcb00021dfa91a1 (patch)
treecf389c366cf044a2a013a746d4c59dc797d60bb4 /indra/newview
parent171089207b528ab80a954292c127ba77254ee927 (diff)
MAINT-2773: Disable texture animation doesn't work
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewerobjectlist.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 66615657d8..b4e287c446 100755
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -954,15 +954,17 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
objectp = *idle_iter;
llassert(objectp->isActive());
objectp->idleUpdate(agent, world, frame_time);
-
- }
+ }
//update flexible objects
LLVolumeImplFlexible::updateClass();
//update animated textures
- LLViewerTextureAnim::updateClass();
- }
+ if (gAnimateTextures)
+ {
+ LLViewerTextureAnim::updateClass();
+ }
+ }