Merge LL viewer-release 6.2.3

.hgtags

@@ -590,3 +590,4 @@ a3143db58a0f6b005232bf9018e7fef17ff9ec90 6.1.0-release
 82a89165e5929a6c3073d6cd60a543cb395f147b 6.2.0-release
 706bdc7e25c6e6b8fb56f4a13fcce2936e70a79c 6.2.1-release
 ec09daf1899c1c01c4ba0ba950fae572f2a612a8 6.2.2-release
+ab2ec5c5423b277d23fd0511ce50c15123ff2e03 6.2.3-release

doc/contributions.txt

@@ -1329,6 +1329,7 @@ Sovereign Engineer
     STORM-2143
     STORM-2148
     MAINT-7343
+    SL-11079
 SpacedOut Frye
 	VWR-34
 	VWR-45

indra/llwindow/llwindowwin32.cpp

@@ -3035,6 +3035,7 @@ BOOL LLWindowWin32::restoreGamma()
 {
 	if (mCustomGammaSet != FALSE)
 	{
+        LL_DEBUGS("Window") << "Restoring gamma" << LL_ENDL;
 		mCustomGammaSet = FALSE;
 		return SetDeviceGammaRamp(mhDC, mPrevGammaRamp);
 	}
@@ -3048,8 +3049,15 @@ BOOL LLWindowWin32::setGamma(const F32 gamma)
 	//Get the previous gamma ramp to restore later.
 	if (mCustomGammaSet == FALSE)
 	{
-		if (GetDeviceGammaRamp(mhDC, mPrevGammaRamp) == FALSE)
-			return FALSE;
+        if (!gGLManager.mIsIntel) // skip for Intel GPUs (see SL-11341)
+        {
+            LL_DEBUGS("Window") << "Getting the previous gamma ramp to restore later" << LL_ENDL;
+            if(GetDeviceGammaRamp(mhDC, mPrevGammaRamp) == FALSE)
+            {
+                LL_WARNS("Window") << "Failed to get the previous gamma ramp" << LL_ENDL;
+                return FALSE;
+            }
+        }
 		mCustomGammaSet = TRUE;
 	}
 

indra/newview/VIEWER_VERSION.txt

@@ -1 +1 @@
-6.2.3
+6.2.4