diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:44:40 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:44:40 -0700 |
| commit | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (patch) | |
| tree | a485d28fd9861c41bf9b7117c085bd84617f43de /indra/newview/llviewerkeyboard.cpp | |
| parent | dd4beb695a9c800b37b7c9a19d3ac3f4456012f5 (diff) | |
| parent | badb8a945d31aed6f396e7efb521e76083870069 (diff) | |
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
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); } |