summaryrefslogtreecommitdiff
path: root/indra/newview/llappdelegate-objc.mm
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2014-03-11 16:32:23 -0700
committerBaker Linden <baker@lindenlab.com>2014-03-11 16:32:23 -0700
commit6137e120d1836ea37ea8f5f6723d86db94f31bd8 (patch)
tree16341e6203400d52e89189d96206c26e899dbe44 /indra/newview/llappdelegate-objc.mm
parentb0c1dd4790847364ebcab1cb1d4103500f64072e (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
3.7.4. merge
Diffstat (limited to 'indra/newview/llappdelegate-objc.mm')
-rw-r--r--indra/newview/llappdelegate-objc.mm7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index 91251ed7c0..988058aad3 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -40,6 +40,11 @@
[super dealloc];
}
+- (void) applicationWillFinishLaunching:(NSNotification *)notification
+{
+ [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:) forEventClass:kInternetEventClass andEventID:kAEGetURL];
+}
+
- (void) applicationDidFinishLaunching:(NSNotification *)notification
{
frameTimer = nil;
@@ -55,7 +60,7 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(languageUpdated) name:@"NSTextInputContextKeyboardSelectionDidChangeNotification" object:nil];
- [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:) forEventClass:kInternetEventClass andEventID:kAEGetURL];
+ // [[NSAppleEventManager sharedAppleEventManager] setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:) forEventClass:kInternetEventClass andEventID:kAEGetURL];
}
- (void) handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent {