Merge remote-tracking branch 'mobserveur/2025.07' into 2025.072025.07

1 files changed, 2 insertions, 4 deletions

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 8c363190f3..109c1d9b15 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -287,7 +287,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
 		//NSOpenGLPFASamples, 0,
 		NSOpenGLPFADepthSize, 24,
 		//NSOpenGLPFAAlphaSize, 8,
-		NSOpenGLPFAColorSize, 24,
+		NSOpenGLPFAColorSize, 32,
 		NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion4_1Core,
 		0
     };
@@ -368,19 +368,17 @@ attributedStringInfo getSegments(NSAttributedString *str)
 	
 	[glContext makeCurrentContext];
 	
-/*
 	if (vsync)
 	{
 		GLint value = 1;
 		[glContext setValues:&value forParameter:NSOpenGLCPSwapInterval];
 	} else {
-    */
 		// supress this error after move to Xcode 7:
 		// error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull]
 		// Tried using ObjC 'nonnull' keyword as per SO article but didn't build
 		GLint swapInterval=0;
 		[glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
-	//}
+	}
 	
     GLint opacity = 1;
     [glContext setValues:&opacity forParameter:NSOpenGLCPSurfaceOpacity];