EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release

1 files changed, 6 insertions, 15 deletions

diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index f3821a8b7a..93ff7e430c 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -185,8 +185,6 @@ BOOL LLDynamicTexture::updateAllInstances()
 		return TRUE;
 	}
 
-	BOOL started = FALSE;
-		
 	BOOL result = FALSE;
 	for( S32 order = 0; order < ORDER_COUNT; order++ )
 	{
@@ -195,29 +193,22 @@ BOOL LLDynamicTexture::updateAllInstances()
 			dynamicTexture = LLDynamicTexture::sInstances[order].getNextData())
 		{
 			if (dynamicTexture->needsRender())
-			{
-				if (!started)
-				{
-					started = TRUE;
-					LLVertexBuffer::startRender();
-				}
-				
-				dynamicTexture->preRender();
+			{	
+				dynamicTexture->preRender();	// Must be called outside of startRender()
+
+				LLVertexBuffer::startRender();
 				if (dynamicTexture->render())
 				{
 					result = TRUE;
 					sNumRenders++;
 				}
+				LLVertexBuffer::stopRender();
+		
 				dynamicTexture->postRender(result);
 			}
 		}
 	}
 
-	if (started)
-	{
-		LLVertexBuffer::stopRender();
-	}
-	
 	return result;
 }