From 60a51fb07178738d6c76bd03e14d70c229ac2b9f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 21 Aug 2012 15:06:46 +0200
Subject: [PATCH] FIRE-7273: (Possible) fix for avatar typing after using
 teleport home chat command: Always stop typing after a TP

---
 indra/newview/llviewermessage.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c5f10d38d0..7da93f6b29 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4443,6 +4443,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	}
 	// </FS:Ansariel>
 
+	// <FS:Ansariel> Stop typing after teleport (possible fix for FIRE-7273)
+	gAgent.stopTyping();
+
 	// Now do teleport effect for where you're going.
 	// VEFFECT: TeleportEnd
 	effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
@@ -7359,6 +7362,9 @@ void process_teleport_local(LLMessageSystem *msg,void**)
 		gAgent.setFlying(FALSE);
 	}
 
+	// <FS:Ansariel> Stop typing after teleport (possible fix for FIRE-7273)
+	gAgent.stopTyping();
+
 	gAgent.setPositionAgent(pos);
 	gAgentCamera.slamLookAt(look_at);