diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index a74c4172eb8d66e2ba8200777dad040c7109f501..7787e2eb26a4b9539a97c0064505dd4af5145319 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1874,7 +1874,7 @@ void LLWindowWin32::recreateWindow(RECT window_rect, DWORD dw_ex_style, DWORD dw
 
 void* LLWindowWin32::createSharedContext()
 {
-    mMaxGLVersion = llclamp(mMaxGLVersion, 3.2f, 4.6f);
+    mMaxGLVersion = llclamp(mMaxGLVersion, 3.f, 4.6f);
 
     S32 version_major = llfloor(mMaxGLVersion);
     S32 version_minor = llround((mMaxGLVersion-version_major)*10);
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 407c4801ca236b906f97ada8ded3a8179ab8eeec..f8a5086130e7c7b958c283f0a86f9c6c21f6c068 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 42
+version 43
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
@@ -297,4 +297,5 @@ list GL3
 RenderFSAASamples           0   0
 RenderReflectionsEnabled    0   0
 RenderReflectionProbeDetail	0	0
+RenderGLMultiThreaded       0   0
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 3aa6551202940eebead6f4c121529812c52ac81d..744d21b2c9ab237433d545b22c5faa8207289ed7 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -8363,7 +8363,14 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_
     channel = shader.enableTexture(LLShaderMgr::DEFERRED_LIGHT, light_target->getUsage());
 	if (channel > -1)
 	{
-        light_target->bindTexture(0, channel, LLTexUnit::TFO_POINT);
+        if (light_target->isComplete())
+        {
+            light_target->bindTexture(0, channel, LLTexUnit::TFO_POINT);
+        }
+        else
+        {
+            gGL.getTexUnit(channel)->bindFast(LLViewerFetchedTexture::sWhiteImagep);
+        }
 	}
 
 	channel = shader.enableTexture(LLShaderMgr::DEFERRED_BLOOM);