Merge of windlight into release (QAR-286). This includes all changes in

windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620

1 files changed, 12 insertions, 2 deletions

diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index 8f6b572a9d..a4b3d259bb 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -40,7 +40,10 @@
 #include "llviewercontrol.h"
 #include "llviewerimage.h"
 #include "llvertexbuffer.h"
+#include "llviewerdisplay.h"
+#include "llglimmediate.h"
 
+void render_ui_and_swap_if_needed();
 
 // static
 LLLinkedList<LLDynamicTexture> LLDynamicTexture::sInstances[ LLDynamicTexture::ORDER_COUNT ];
@@ -216,15 +219,22 @@ BOOL LLDynamicTexture::updateAllInstances()
 			dynamicTexture = LLDynamicTexture::sInstances[order].getNextData())
 		{
 			if (dynamicTexture->needsRender())
-			{	
+			{
+				render_ui_and_swap_if_needed();
+				glClear(GL_DEPTH_BUFFER_BIT);
+				gDisplaySwapBuffers = FALSE;
+				
+				LLVertexBuffer::startRender();
+				gGL.start();
+								
 				dynamicTexture->preRender();	// Must be called outside of startRender()
 
-				LLVertexBuffer::startRender();
 				if (dynamicTexture->render())
 				{
 					result = TRUE;
 					sNumRenders++;
 				}
+				gGL.stop();
 				LLVertexBuffer::stopRender();
 		
 				dynamicTexture->postRender(result);