diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-22 16:41:50 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-22 16:41:50 -0400 |
commit | d12be5978eb948adbb4f3c41f2d90a826af1fc89 (patch) | |
tree | 028a6991be06be4db7df1375429dfd9b7d980c2e /indra/llwindow | |
parent | 449de8e6085c1ddb7a4bd9dcd835aecbf45a7d11 (diff) | |
parent | 566a6191131249e5f2fbb0015522092d04d26b93 (diff) |
merge
Diffstat (limited to 'indra/llwindow')
-rw-r--r-- | indra/llwindow/llwindowmacosx-objc.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm index 59b25e1726..3a822a93a6 100644 --- a/indra/llwindow/llwindowmacosx-objc.mm +++ b/indra/llwindow/llwindowmacosx-objc.mm @@ -49,6 +49,11 @@ void setupCocoa() { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + // The following prevents the Cocoa command line parser from trying to open 'unknown' arguements as documents. + // ie. running './secondlife -set Language fr' would cause a pop-up saying can't open document 'fr' + // when init'ing the Cocoa App window. + [[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; + // This is a bit of voodoo taken from the Apple sample code "CarbonCocoa_PictureCursor": // http://developer.apple.com/samplecode/CarbonCocoa_PictureCursor/index.html |