diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
index e09d0f349..868a2e4b1 100644
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -357,13 +357,20 @@ void LLPostProcess::createScreenTextures()
 	if(mDepthTexture)
 		LLImageGL::deleteTextures(type, 0, 0, 1, &mDepthTexture, true);
 
-	LLImageGL::generateTextures(type, GL_DEPTH_COMPONENT24, 1, &mDepthTexture);
-	gGL.getTexUnit(0)->bindManual(type, mDepthTexture);
-	LLImageGL::setManualImage(LLTexUnit::getInternalType(type), 0, GL_DEPTH_COMPONENT24, mScreenWidth, mScreenHeight, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
-	stop_glerror();
-	gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
-	gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
-	stop_glerror();
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	{
+		if((*it)->getDepthChannel()>=0)
+		{
+			LLImageGL::generateTextures(type, GL_DEPTH_COMPONENT24, 1, &mDepthTexture);
+			gGL.getTexUnit(0)->bindManual(type, mDepthTexture);
+			LLImageGL::setManualImage(LLTexUnit::getInternalType(type), 0, GL_DEPTH_COMPONENT24, mScreenWidth, mScreenHeight, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
+			stop_glerror();
+			gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
+			gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
+			stop_glerror();
+			break;
+		}
+	}
 }
 
 void LLPostProcess::createNoiseTexture()
@@ -375,22 +382,15 @@ void LLPostProcess::createNoiseTexture()
 		}
 	}
 
-	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	mNoiseTexture = new LLImageGL(FALSE) ;
+	if(mNoiseTexture->createGLTexture())
 	{
-		if((*it)->getDepthChannel()>=0)
-		{
-			mNoiseTexture = new LLImageGL(FALSE) ;
-			if(mNoiseTexture->createGLTexture())
-			{
-				gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mNoiseTexture->getTexName());
-				LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
-				stop_glerror();
-				gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
-				gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
-				stop_glerror();
-				break;
-			}
-		}
+		gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mNoiseTexture->getTexName());
+		LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
+		stop_glerror();
+		gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
+		gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
+		stop_glerror();
 	}
 }
 
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index b952a0e4b..d73b17a51 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -380,7 +380,7 @@ bool LLTexUnit::bind(LLRenderTarget* renderTarget, bool bindDepth)
 
 	if (bindDepth)
 	{
-		if (renderTarget->hasStencil() && renderTarget->getFBO())
+		if (renderTarget->hasStencil())
 		{
 			llerrs << "Cannot bind a render buffer for sampling.  Allocate render target without a stencil buffer if sampling of depth buffer is required." << llendl;
 		}