diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 977245b6e..9c8af6888 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -51,7 +51,7 @@ void check_framebuffer_status()
 }
 
 bool LLRenderTarget::sUseFBO = false;
-U32 LLRenderTarget::sCurFBO = 0;
+LLRenderTarget* LLRenderTarget::sCurFBO = 0;
 
 LLRenderTarget::LLRenderTarget() :
 	mResX(0),
@@ -161,7 +161,7 @@ bool LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, boo
 				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, LLTexUnit::getInternalType(mUsage), mDepth, 0);
 				stop_glerror();
 			}
-			glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO);
+			glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO ? sCurFBO->getFBO() : 0);
 		}
 
 		stop_glerror();
@@ -248,7 +248,7 @@ bool LLRenderTarget::addColorAttachment(U32 color_fmt)
 
 		check_framebuffer_status();
 		
-		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO);
+		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO ? sCurFBO->getFBO() : 0);
 	}
 
 	mTex.push_back(tex);
@@ -343,7 +343,7 @@ void LLRenderTarget::shareDepthBuffer(LLRenderTarget& target)
 
 		check_framebuffer_status();
 
-		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO);
+		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO ? sCurFBO->getFBO() : 0);
 
 		target.mUseDepth = true;
 	}
@@ -365,6 +365,7 @@ void LLRenderTarget::release()
 			{
 				glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
 				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, LLTexUnit::getInternalType(mUsage), 0, 0);
+				glBindFramebuffer(GL_FRAMEBUFFER,0);
 			}
 			LLImageGL::deleteTextures(mUsage, 0, 0, 1, &mDepth, true);
 			stop_glerror();
@@ -386,6 +387,7 @@ void LLRenderTarget::release()
 		{ //attached as a texture
 			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, LLTexUnit::getInternalType(mUsage), 0, 0);
 		}
+		glBindFramebuffer(GL_FRAMEBUFFER,0);
 		mUseDepth = false;
 	}
 
@@ -414,17 +416,18 @@ void LLRenderTarget::bindTarget()
 	if (mFBO)
 	{
 		stop_glerror();
+
 		mPreviousFBO = sCurFBO;
 		if (mSampleBuffer)
 		{
 			mSampleBuffer->bindTarget(this);
-			sCurFBO = mSampleBuffer->mFBO;
+			sCurFBO = mSampleBuffer;
 			stop_glerror();
 		}
 		else
 		{
 			glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
-			sCurFBO = mFBO;
+			sCurFBO = this;
 
 			stop_glerror();
 			if (gGLManager.mHasDrawBuffers)
@@ -577,8 +580,18 @@ void LLRenderTarget::flush(bool fetch_depth)
 			}
 			glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
 		}
-		glBindFramebuffer(GL_FRAMEBUFFER, mPreviousFBO);
+		glBindFramebuffer(GL_FRAMEBUFFER, mPreviousFBO ? mPreviousFBO->getFBO() : 0);
 		sCurFBO = mPreviousFBO;
+
+		if(mPreviousFBO)
+		{
+			glViewport(0, 0, mPreviousFBO->mResX, mPreviousFBO->mResY);
+			mPreviousFBO = NULL;
+		}
+		else
+		{
+			glViewport(gGLViewport[0],gGLViewport[1],gGLViewport[2],gGLViewport[3]);
+		}
 		stop_glerror();
 	}
 }
@@ -613,7 +626,7 @@ void LLRenderTarget::copyContents(LLRenderTarget& source, S32 srcX0, S32 srcY0,
 			stop_glerror();
 			glCopyTexSubImage2D(LLTexUnit::getInternalType(mUsage), 0, srcX0, srcY0, dstX0, dstY0, dstX1, dstY1);
 			stop_glerror();
-			glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO);
+			glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO ? sCurFBO->getFBO() : 0);
 			stop_glerror();
 		}
 		else
@@ -636,7 +649,7 @@ void LLRenderTarget::copyContents(LLRenderTarget& source, S32 srcX0, S32 srcY0,
 			stop_glerror();
 			glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
 			stop_glerror();
-			glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO);
+			glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO ? sCurFBO->getFBO() : 0);
 			stop_glerror();
 		}
 	}
@@ -670,7 +683,7 @@ void LLRenderTarget::copyContentsToFramebuffer(LLRenderTarget& source, S32 srcX0
 		if(mask)
 			glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 		stop_glerror();
-		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO);
+		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO ? sCurFBO->getFBO() : 0);
 		stop_glerror();
 	}
 }
@@ -819,7 +832,7 @@ bool LLMultisampleBuffer::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth
 		}
 		
 		stop_glerror();
-		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO);
+		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO ? sCurFBO->getFBO() : 0);
 		stop_glerror();
 		
 		
@@ -898,7 +911,7 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt)
 		glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
 		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+offset, GL_RENDERBUFFER, tex);
 		check_framebuffer_status();
-		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO);
+		glBindFramebuffer(GL_FRAMEBUFFER, sCurFBO ? sCurFBO->getFBO() : 0);
 	}
 
 	mTex.push_back(tex);
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h
index c2696aae6..f2401eed4 100644
--- a/indra/llrender/llrendertarget.h
+++ b/indra/llrender/llrendertarget.h
@@ -65,7 +65,7 @@ public:
 	//whether or not to use FBO implementation
 	static bool sUseFBO; 
 	static U32 sBytesAllocated;
-	static U32 sCurFBO;
+	static LLRenderTarget* sCurFBO;
 
 	LLRenderTarget();
 	virtual ~LLRenderTarget();
@@ -154,7 +154,7 @@ protected:
 	std::vector<U32> mTex;
 	std::vector<U32> mInternalFormat;
 	U32 mFBO;
-	U32 mPreviousFBO;
+	LLRenderTarget* mPreviousFBO;
 	U32 mDepth;
 	bool mStencil;
 	bool mUseDepth;