diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-19 01:17:12 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-19 01:17:12 +0300 |
| commit | 932882da22c864dd996d63f35fe168516d3bd654 (patch) | |
| tree | 6629970ba230ee9545e8499776a9073ebcb1d72a /indra/newview/llviewerkeyboard.cpp | |
| parent | 1c2bbf6ccbadfdbfaadb0b750a950e0d6add6fb8 (diff) | |
| parent | 9b99ece5ab43b6cb28944d1e412f06c6b22dbc2c (diff) | |
Merge with bitbucket.org/msavchenko/viewer-release-maint-3132
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
| -rwxr-xr-x | indra/newview/llviewerkeyboard.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 47a8a04b63..2fbb3bf868 100755 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -534,6 +534,11 @@ void stop_moving( EKeystate s ) void start_chat( EKeystate s ) { + if (LLAppViewer::instance()->quitRequested()) + { + return; // can't talk, gotta go, kthxbye! + } + // start chat LLFloaterIMNearbyChat::startChat(NULL); } |