diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
commit | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (patch) | |
tree | adeadd5ef0b8c4514b325f74c3426b2af76e422b /indra/newview/llviewerkeyboard.cpp | |
parent | f53b2bd880875b5194b6d298e1aad7d8951db9f3 (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
Pull merge of lindenlab/viewer-release
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); } |