From e62a54a64332d32174dbea6543903d2e6c232c95 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 20 Oct 2019 18:47:24 +0200
Subject: [PATCH] Merge fix

---
 indra/llwindow/llwindowmacosx-objc.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 43e1fafa83..7d54bdaee2 100644
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -407,7 +407,7 @@ void allowDirectMarkedTextInput(bool allow, GLViewRef glView)
 
 NSWindowRef getMainAppWindow()
 {
-	LLNSWindow *winRef = [(LLAppDelegate*)[[LLNSApplication sharedApplication] delegate] window];
+	LLNSWindow *winRef = [(LLAppDelegate*)[[NSApplication sharedApplication] delegate] window];
 	
 	[winRef setAcceptsMouseMovedEvents:TRUE];
 	return winRef;
@@ -420,7 +420,7 @@ void makeFirstResponder(NSWindowRef window, GLViewRef view)
 
 void requestUserAttention()
 {
-	[[LLNSApplication sharedApplication] requestUserAttention:NSInformationalRequest];
+	[[NSApplication sharedApplication] requestUserAttention:NSInformationalRequest];
 }
 
 long showAlert(std::string text, std::string title, int type)
@@ -470,7 +470,7 @@ long showAlert(std::string text, std::string title, int type)
 /*
  GLViewRef getGLView()
  {
- return [(LLAppDelegate*)[[LLNSApplication sharedApplication] delegate] glview];
+ return [(LLAppDelegate*)[[NSApplication sharedApplication] delegate] glview];
  }
  */