diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:41:02 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:41:02 -0700 |
| commit | e41412eddaa5e8fcc808018aadc844dd68c6c247 (patch) | |
| tree | 9dea64df34a79e5d6454ab0f29c52e70243b388e /indra/newview/llappdelegate-objc.mm | |
| parent | 75f26d123da0d90c13f1614118c4ace8c1f04598 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-531
Diffstat (limited to 'indra/newview/llappdelegate-objc.mm')
| -rw-r--r-- | indra/newview/llappdelegate-objc.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm index a2b7362608..3f1b5139c5 100644 --- a/indra/newview/llappdelegate-objc.mm +++ b/indra/newview/llappdelegate-objc.mm @@ -134,6 +134,7 @@ // called again. Since it returned false, do not yet cancel // frameTimer. handleQuit(); + [[NSApplication sharedApplication] stopModal]; return NSTerminateCancel; } else { // pumpMainLoop() returned true: it's done. Okay, done with frameTimer. |