Merge with 3.7.8-release

1 files changed, 17 insertions, 4 deletions

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index b393a3796d..017ea3769c 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 (mOldResize)  //Maint-3135
+    {
+        NSSize size = [self frame].size;
+        callResize(size.width, size.height);
+    }
 }
 
 - (unsigned long)getVramSize
@@ -124,10 +127,18 @@ attributedStringInfo getSegments(NSAttributedString *str)
 											   object:[self window]];
 }
 
+- (void)setOldResize:(bool)oldresize
+{
+    mOldResize = oldresize;
+}
+
 - (void)windowResized:(NSNotification *)notification;
 {
-	//NSSize size = [self frame].size;
-	//callResize(size.width, size.height);
+    if (!mOldResize)  //Maint-3288
+    {
+        NSSize size = [self frame].size;
+        callResize(size.width, size.height);
+    }
 }
 
 - (void)dealloc
@@ -204,6 +215,8 @@ attributedStringInfo getSegments(NSAttributedString *str)
 		[glContext setValues:(const GLint*)0 forParameter:NSOpenGLCPSwapInterval];
 	}
 	
+    mOldResize = false;
+    
 	return self;
 }