diff options
| author | palange <palange@lindenlab.com> | 2010-06-22 13:13:40 -0700 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2010-06-22 13:13:40 -0700 |
| commit | 566a6191131249e5f2fbb0015522092d04d26b93 (patch) | |
| tree | ed0171e3229c73c48faaf0cb0aba6cd23346c67a /indra/llwindow | |
| parent | dfc20a824944d372c6978ca7b89289ec542554a9 (diff) | |
| parent | f388efa49a75206223137c328f2a1fe0853d02a7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
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 |