diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
| commit | b6708435214a5af158956b0f6ef6a90bacbcc142 (patch) | |
| tree | 1a0f0612cc87d43e33d466afc7d6928ec7a2e20b /indra/newview/llappdelegate-objc.mm | |
| parent | 20d486b52fb8ecefc03eb63a93e4447513d704d2 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/newview/llappdelegate-objc.mm')
| -rw-r--r-- | indra/newview/llappdelegate-objc.mm | 7 |
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 { |