indra/newview/app_settings/shaders/class1/alchemy/toneMapF.glsl

@@ -213,6 +213,9 @@ void main()
     #define NEEDS_GAMMA_CORRECT 1
     #endif
     
+    // We should always be 0-1 past here.
+    diff.rgb = clamp(diff.rgb, 0, 1);
+
     #if NEEDS_GAMMA_CORRECT != 0
     diff.rgb = linear_to_srgb(diff.rgb);
     #endif

indra/newview/llmediactrl.cpp

@@ -386,7 +386,9 @@ BOOL LLMediaCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
 		mMediaSource->mouseDoubleClick( x, y, mask);
 
 	gFocusMgr.setMouseCapture( this );
+#if LL_LINUX
 	gFocusMgr.setKeyboardFocus( this );
+#endif
 
 	if (mTakeFocusOnClick)
 	{
@@ -403,8 +405,10 @@ void LLMediaCtrl::onFocusReceived()
 	if (mMediaSource)
 	{
 		mMediaSource->focus(true);
+#if LL_LINUX
 		getWindow()->allowLanguageTextInput(NULL, TRUE);
-		
+#endif
+
 		// Set focus for edit menu items
 		LLEditMenuHandler::gEditMenuHandler = mMediaSource;
 	}
@@ -419,7 +423,9 @@ void LLMediaCtrl::onFocusLost()
 	if (mMediaSource)
 	{
 		mMediaSource->focus(false);
+#if LL_LINUX
 		getWindow()->allowLanguageTextInput(NULL, FALSE);
+#endif
 
 		if( LLEditMenuHandler::gEditMenuHandler == mMediaSource )
 		{

indra/newview/pipeline.cpp

@@ -8122,6 +8122,11 @@ void LLPipeline::renderFinalize()
 				pRenderBuffer->copyContents(mScreen, 0, 0, mScreen.getWidth(), mScreen.getHeight(), 0, 0,
 					mScreen.getWidth(), mScreen.getHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
             }
+			else
+			{
+				LLRenderTarget::copyContentsToFramebuffer(mScreen, 0, 0, mScreen.getWidth(), mScreen.getHeight(), 0, 0,
+					mScreen.getWidth(), mScreen.getHeight(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			}
 // [/RLVa:KB]
         }
 
@@ -9322,7 +9327,7 @@ void LLPipeline::renderDeferredLighting(LLRenderTarget *screen_target)
 
 			gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
 
-			mHDRScreen.bindTexture(0, 0, LLTexUnit::TFO_BILINEAR);
+			mHDRScreen.bindTexture(0, 0, LLTexUnit::TFO_POINT);
 
 			gGL.color4f(1, 1, 1, 1);
 			gPipeline.enableLightsFullbright();