1 files changed, 8 insertions, 1 deletions

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
         {