From 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Wed, 30 May 2007 17:39:09 +0000
Subject: merge -r61423:62602 svn/branches/maintenance --> release

---
 indra/newview/llchatbar.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llchatbar.cpp')

diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index c5e7eaa1e9..4beea0d112 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -98,8 +98,8 @@ LLChatBar::LLChatBar(const std::string& name, const LLRect& rect)
 		mInputEditor->setRevertOnEsc( FALSE );
 		mInputEditor->setIgnoreTab(TRUE);
 		mInputEditor->setPassDelete(TRUE);
-
 		mInputEditor->setMaxTextLength(1023);
+		mInputEditor->setEnableLineHistory(TRUE);
 	}
 
 	// Build the list of gestures
@@ -426,6 +426,8 @@ void LLChatBar::sendChat( EChatType type )
 
 	if (!text.empty())
 	{
+		// store sent line in history, duplicates will get filtered
+		mInputEditor->updateHistory();
 		// Check if this is destined for another channel
 		S32 channel = 0;
 		stripChannelNumber(text, &channel);
-- 
cgit v1.2.3