summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-23 10:55:32 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-23 10:55:32 -0700
commit70cf100f747dd3511c5e1dda668ddb97487b98ab (patch)
tree5108f22422673308bbb705ad92becec254deee5c /indra/llwindow
parent63be74f57c5a520e308a90d44e58ae5e5ba2e6bf (diff)
parent6c57abb295447f2b44eb833cb77fa718dc2b1118 (diff)
Merged from viewer-release
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/llwindowmacosx-objc.mm5
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