diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-13 17:16:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-13 17:16:57 -0400 |
| commit | 0311299be2655014d40393724668e70b7dd2a6bf (patch) | |
| tree | e9d6a72efc64df0f0899665ab3ad7d1c390cebee | |
| parent | e7c33a5071532820aeed814ba8d736afa166b882 (diff) | |
| parent | b6ebb422fc5aa93c205b79293e8dc8d9a66b1a27 (diff) | |
merge changes for STORM-2053
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llappdelegate-objc.mm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c82ace2ca5..b5db1fa5a3 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -324,6 +324,7 @@ Cinder Roxley STORM-2035 STORM-2036 STORM-2037 + STORM-2053 Clara Young Coaldust Numbers VWR-1095 diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm index 988058aad3..aad5dbae7d 100644 --- a/indra/newview/llappdelegate-objc.mm +++ b/indra/newview/llappdelegate-objc.mm @@ -84,7 +84,7 @@ callWindowUnfocus(); } -- (NSApplicationDelegateReply) applicationShouldTerminate:(NSApplication *)sender +- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication *)sender { if (!runMainLoop()) { |