merge changes for maint-2773

doc/contributions.txt

@@ -177,6 +177,7 @@ Ansariel Hiller
 	STORM-1899
 	STORM-1932
 	MAINT-2368
+	MAINT-2773
 Aralara Rajal
 Ardy Lay
 	STORM-859

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();
+		}
+	}