6 files changed, 14 insertions, 5 deletions
diff --git a/indra/llwindow/lldragdropwin32.h b/indra/llwindow/lldragdropwin32.h
index 929e7f9e37..a6824f3e90 100755
--- a/indra/llwindow/lldragdropwin32.h
+++ b/indra/llwindow/lldragdropwin32.h
@@ -57,7 +57,7 @@ class LLDragDropWin32
 #include <windows.h>
 #include <ole2.h>
 
-// imposter class that does nothing 
+// impostor class that does nothing 
 class LLDragDropWin32
 {
 	public:
diff --git a/indra/llwindow/llopenglview-objc.h b/indra/llwindow/llopenglview-objc.h
index 41837b1eb4..1e0e47cd02 100644
--- a/indra/llwindow/llopenglview-objc.h
+++ b/indra/llwindow/llopenglview-objc.h
@@ -65,6 +65,7 @@
 - (unsigned long) getVramSize;
 
 - (void) allowMarkedTextInput:(bool)allowed;
+- (void) viewDidEndLiveResize;
 
 @end
 
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 5f34d03c35..7415c9d8dc 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -91,6 +91,13 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 @implementation LLOpenGLView
 
+// Force a high quality update after live resizing
+- (void) viewDidEndLiveResize
+{
+    NSSize size = [self frame].size;
+    callResize(size.width, size.height);
+}
+
 - (unsigned long)getVramSize
 {
     CGLRendererInfoObj info = 0;
@@ -119,9 +126,8 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void)windowResized:(NSNotification *)notification;
 {
-	NSSize size = [self frame].size;
-	
-	callResize(size.width, size.height);
+	//NSSize size = [self frame].size;
+	//callResize(size.width, size.height);
 }
 
 - (void)dealloc
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index e9147d552e..78186004b8 100755
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -42,6 +42,7 @@ class LLWindowCallbacks;
 class LLWindow : public LLInstanceTracker<LLWindow>
 {
 public:
+
 	struct LLWindowResolution
 	{
 		S32 mWidth;
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
index 3b6295fba8..81b25601a9 100755
--- a/indra/llwindow/llwindowmacosx-objc.h
+++ b/indra/llwindow/llwindowmacosx-objc.h
@@ -52,6 +52,7 @@ void handleQuit();
 bool runMainLoop();
 void initMainLoop();
 void cleanupViewer();
+void handleUrl(const char* url);
 
 /* Defined in llwindowmacosx-objc.mm: */
 int createNSApp(int argc, const char **argv);
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 0354c2b717..0768d0352e 100755
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -57,7 +57,7 @@ void setupCocoa()
 		[[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
 		
 		[pool release];
-		
+
 		inited = true;
 	}
 }