diff options
author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
commit | 1333e9332a074e25178cd28b351bb40998617e10 (patch) | |
tree | c229dd9782a27e3c72d7d99c4a6e15367fb8dbd9 /indra/newview/llappdelegate-objc.mm | |
parent | 6a3cb427071641585d9beb44c3e46a148f90a791 (diff) | |
parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) |
merge changes for 3.7.23
Diffstat (limited to 'indra/newview/llappdelegate-objc.mm')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llappdelegate-objc.mm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm index aad5dbae7d..549df80fa1 100644..100755 --- a/indra/newview/llappdelegate-objc.mm +++ b/indra/newview/llappdelegate-objc.mm @@ -84,7 +84,17 @@ callWindowUnfocus(); } -- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication *)sender +- (void) applicationDidHide:(NSNotification *)notification +{ + callWindowHide(); +} + +- (void) applicationDidUnhide:(NSNotification *)notification +{ + callWindowUnhide(); +} + +- (NSApplicationDelegateReply) applicationShouldTerminate:(NSApplication *)sender { if (!runMainLoop()) { |