From b47c4093755009b1f33648d58439448c5a95def2 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 27 Jul 2010 12:48:58 -0700
Subject: Don't play typing anim when using a default channel other than 0

---
 linden/indra/newview/llchatbar.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index bbf6b04..4e491a9 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -557,7 +557,14 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
 	if ( (length > 0) && (raw_text[0] != '/') && (!gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT)) )
 // [/RLVa:KB]
 	{
-		gAgent.startTyping();
+		if (self->mChanCtrlEnabled && (S32)(self->mChannelControl->get()) != 0)
+		{
+			gAgent.stopTyping();
+		}
+		else
+		{
+			gAgent.startTyping();
+		}
 	}
 	else
 	{
-- 
cgit v1.1