diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-09-26 18:53:12 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-09-26 18:53:12 -0700 |
| commit | c775ae7cbd92099ee7a71c219a1b4b9ff7e7d82f (patch) | |
| tree | 9b3a0c1ef78b65405fb97c13c25629b383852efc /indra/llwindow | |
| parent | b8a1fd33f5e5d438eaa708ff4687215d9f1a79c8 (diff) | |
MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for SLURL handling
Diffstat (limited to 'indra/llwindow')
| -rwxr-xr-x | indra/llwindow/llwindowmacosx-objc.h | 1 | ||||
| -rwxr-xr-x | indra/llwindow/llwindowmacosx-objc.mm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 32b3bfb078..2cae6f3f72 100755 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -49,6 +49,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; } } |