diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-23 12:05:09 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-23 12:05:09 +0300 |
| commit | 6290930c98ace2d3b3d76d3be0a06df718a9a238 (patch) | |
| tree | 48584ccb08b80d120ec53f3d1df16df55cd9480b /indra/llwindow | |
| parent | e02b51f125f876cfef10f504a121693b3612155a (diff) | |
| parent | 11ec720a063b73fc042e8b06338b9526835dbb6b (diff) | |
Merge with default branch
--HG--
branch : product-engine
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 |