From 40bb92c99fd2f8b1135c8a69ea959dd115516ea7 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 15 Mar 2017 23:32:21 +0100
Subject: [PATCH] Make sure to definitely stop typing after 5 secs, even if we
 don't receive the timeout via process_chat_from_simulator

---
 indra/newview/llvoavatarself.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 4bc91f635b..b84ed40e40 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1008,6 +1008,13 @@ void LLVOAvatarSelf::idleUpdate(LLAgent &agent, const F64 &time)
 	{
 		LLVOAvatar::idleUpdate(agent, time);
 		idleUpdateTractorBeam();
+
+		// <FS:Ansariel> Make sure to definitely stop typing
+		if ((gAgent.getTypingTime() > LLAgent::TYPING_TIMEOUT_SECS) && (gAgent.getRenderState() & AGENT_STATE_TYPING))
+		{
+			gAgent.stopTyping();
+		}
+		// </FS:Ansariel>
 	}
 }