summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx-objc.mm
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-10-04 15:36:52 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-10-04 15:36:52 -0400
commit6f5790da38b3005292d3dbeaad778ea740110e33 (patch)
treeb28ce7a7a158f72f4dbfda60bafff2317c671837 /indra/llwindow/llwindowmacosx-objc.mm
parent56e2f11417183d8dcc3d681f79fc63446b236abb (diff)
parentf7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff)
Merge. Pull in viewer-release after 3.6.7 release.
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.mm')
-rwxr-xr-xindra/llwindow/llwindowmacosx-objc.mm2
1 files changed, 1 insertions, 1 deletions
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;
}
}