diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-15 12:34:18 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-15 12:34:18 -0500 |
| commit | dab5acd972c05b4c9d23d5dfb46afe9eff6c9567 (patch) | |
| tree | 6f3b1ca79eefbc2b232a5da809359eefcf59ecfb /indra/newview/llappdelegate-objc.mm | |
| parent | eb5c0dd32a7f4e4a603fe88cfa5f18c30725d11a (diff) | |
| parent | 6d48db868f7459fcf5f0e89d830a844e409d4163 (diff) | |
merge changes for 3.7.22-release
Diffstat (limited to 'indra/newview/llappdelegate-objc.mm')
| -rw-r--r-- | indra/newview/llappdelegate-objc.mm | 2 |
1 files changed, 1 insertions, 1 deletions
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()) { |