From d2f4d1986c20ef188d13a05f977543714c361d65 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Sun, 21 Jul 2013 06:27:41 -0600
Subject: [PATCH] Fix first character being missed by the chat entry when
 typing from chat history in in's.

---
 indra/newview/fschathistory.cpp | 8 ++++----
 indra/newview/fschathistory.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index 99e5f4b52e..a0f471f17e 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -72,7 +72,7 @@
 // <FS_Zi> FIRE-8602: Typing in chat history focuses chat input line
 #include "llfocusmgr.h"
 #include "llkeyboard.h"
-#include "lllineeditor.h"
+#include "llchatentry.h"
 // </FS:Zi>
 #include "llpanelblockedlist.h"
 
@@ -704,8 +704,8 @@ protected:
 	std::string			mFrom;
 	LLUUID				mSessionID;
 // [RLVa:KB] - Checked: 2010-04-22 (RLVa-1.2.2a) | Added: RLVa-1.2.0f
-	bool			mShowContextMenu;
-	bool			mShowInfoCtrl;
+	bool				mShowContextMenu;
+	bool				mShowInfoCtrl;
 // [/RLVa:KB]
 
 	S32					mMinUserNameWidth;
@@ -1256,7 +1256,7 @@ BOOL FSChatHistory::handleUnicodeCharHere(llwchar uni_char)
 			// focus on the next item that is a text input control
 			focusRoot->focusNextItem(true);
 			// remember the control's pointer if it really is a LLLineEditor
-			mChatInputLine = dynamic_cast<LLLineEditor*>(gFocusMgr.getKeyboardFocus());
+			mChatInputLine = dynamic_cast<LLChatEntry*>(gFocusMgr.getKeyboardFocus());
 		}
 	}
 
diff --git a/indra/newview/fschathistory.h b/indra/newview/fschathistory.h
index 07fcb23e3e..21d9a24a4c 100644
--- a/indra/newview/fschathistory.h
+++ b/indra/newview/fschathistory.h
@@ -33,7 +33,7 @@
 #include "lltextbox.h"
 #include "llviewerchat.h"
 
-class LLLineEditor;	// <FS_Zi> FIRE-8602: Typing in chat history focuses chat input line
+class LLChatEntry;	// <FS_Zi> FIRE-8602: Typing in chat history focuses chat input line
 
 //Chat log widget allowing addition of a message as a widget
 class FSChatHistory : public LLTextEditor	// <FS:Zi> FIRE-8600: TAB out of chat history
@@ -148,7 +148,7 @@ class FSChatHistory : public LLTextEditor	// <FS:Zi> FIRE-8600: TAB out of chat
 	public:
 		virtual BOOL	handleUnicodeCharHere(llwchar uni_char);
 
-		LLLineEditor* mChatInputLine;
+		LLChatEntry* mChatInputLine;
 	// </FS:Zi>
 };
 #endif // FS_CHATHISTORY_H