From b6cfd67a36fe34092dd812940bf051994d0317f5 Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham Linden)" <graham@lindenlab.com>
Date: Thu, 12 Sep 2013 09:48:28 -0700
Subject: MAINT-3134 keep chat from opening in response to key confirm on quit
 dialog, fix mac-only sketchy precedence warning, and re-re-re-re-re-remove
 patch file that simply will not die.

---
 indra/newview/llviewerkeyboard.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/llviewerkeyboard.cpp')

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);
 }
-- 
cgit v1.2.3