From ec8da7c32f9ce51d55349306e6ebfc0c1bfbc91a Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Sun, 4 May 2014 15:47:53 +0100
Subject: [PATCH] FIRE-11882: Going fullscreen in OS X fails while inworld -
 patch from Cinder Roxley

--HG--
branch : Firestorm_4.6.5
---
 indra/llwindow/llopenglview-objc.mm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 85f34af047..7d258ac9a3 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -94,8 +94,11 @@ attributedStringInfo getSegments(NSAttributedString *str)
 // Force a high quality update after live resizing
 - (void) viewDidEndLiveResize
 {
-    NSSize size = [self frame].size;
-    callResize(size.width, size.height);
+	if (NSAppKitVersionNumber < NSAppKitVersionNumber10_7)
+	{
+		NSSize size = [self frame].size;
+		callResize(size.width, size.height);
+	}
 }
 
 - (unsigned long)getVramSize
@@ -126,8 +129,11 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void)windowResized:(NSNotification *)notification;
 {
-	//NSSize size = [self frame].size;
-	//callResize(size.width, size.height);
+	if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_7)
+	{
+		NSSize size = [self frame].size;
+		callResize(size.width, size.height);
+	}
 }
 
 - (void)dealloc