diff options
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llviewerobjectlist.cpp | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index bb4450872f..4572ebf5a5 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -177,6 +177,7 @@ Ansariel Hiller STORM-1899 STORM-1932 MAINT-2368 + MAINT-2773 Aralara Rajal Ardy Lay STORM-859 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(); + } + } |