merge release@58699 beta-1-14-0@58707 -> release

1 files changed, 15 insertions, 0 deletions

diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index 0f0a9d9bda..f2981625f7 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -16,6 +16,8 @@
 #include "llviewercamera.h"
 #include "llviewercontrol.h"
 #include "llviewerimage.h"
+#include "llvertexbuffer.h"
+
 
 // static
 LLLinkedList<LLDynamicTexture> LLDynamicTexture::sInstances[ LLDynamicTexture::ORDER_COUNT ];
@@ -174,6 +176,8 @@ BOOL LLDynamicTexture::updateAllInstances()
 		return TRUE;
 	}
 
+	BOOL started = FALSE;
+		
 	BOOL result = FALSE;
 	for( S32 order = 0; order < ORDER_COUNT; order++ )
 	{
@@ -183,6 +187,12 @@ BOOL LLDynamicTexture::updateAllInstances()
 		{
 			if (dynamicTexture->needsRender())
 			{
+				if (!started)
+				{
+					started = TRUE;
+					LLVertexBuffer::startRender();
+				}
+				
 				dynamicTexture->preRender();
 				if (dynamicTexture->render())
 				{
@@ -194,6 +204,11 @@ BOOL LLDynamicTexture::updateAllInstances()
 		}
 	}
 
+	if (started)
+	{
+		LLVertexBuffer::stopRender();
+	}
+	
 	return result;
 }