diff options
| author | simon_linden <none@none> | 2013-09-19 15:30:34 -0700 |
|---|---|---|
| committer | simon_linden <none@none> | 2013-09-19 15:30:34 -0700 |
| commit | d3625d0b672d59b0164e1b4615edbb9550912ec6 (patch) | |
| tree | 292f86a4e1dc65d57faee094f5365bf72a240846 /indra/newview/llviewerkeyboard.cpp | |
| parent | 8fa463113c19682a64988d2f8c527ef5e5dd156c (diff) | |
| parent | 95e34d86b9d86b3b3c7d3c39620e35b06f8fa9cf (diff) | |
Merge downstream code
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); } |