Backed out changeset a62bf7c0af21

Backing out this merge that I pushed (prematurely) to the wrong place.

1 files changed, 5 insertions, 17 deletions

diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index ed35546ca3..466cb4709e 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -161,19 +161,12 @@ void LLViewerDynamicTexture::postRender(BOOL success)
 			{
 				generateGLTexture() ;
 			}
-			else if(!mGLTexturep->getHasGLTexture())
-			{
-				generateGLTexture() ;
-			}			
-			else if(mGLTexturep->getDiscardLevel() != 0)//do not know how it happens, but regenerate one if it does.
+			if(!mGLTexturep->getHasGLTexture())
 			{
 				generateGLTexture() ;
 			}
+			llcallstacks << "class type: " << (S32)getType() << llcallstacksendl ;
 
-			if(gGLManager.mDebugGPU)
-			{
-				LLGLState::dumpStates() ;
-			}
 			success = mGLTexturep->setSubImageFromFrameBuffer(0, 0, mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight);
 		}
 	}
@@ -212,16 +205,11 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
 		{
 			LLViewerDynamicTexture *dynamicTexture = *iter;
 			if (dynamicTexture->needsRender())
-			{				
-				if(gGLManager.mDebugGPU)
-				{				
-					llinfos << "class type: " << (S32)dynamicTexture->getType() << llendl;
-					LLGLState::dumpStates() ;
-				}
-
+			{
 				glClear(GL_DEPTH_BUFFER_BIT);
 				gDepthDirty = TRUE;
-								
+				
+				
 				gGL.color4f(1,1,1,1);
 				dynamicTexture->preRender();	// Must be called outside of startRender()
 				result = FALSE;