From 4601aef70abe611a2a25b3e236cc089ff2bcb6af Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 9 Sep 2009 04:27:06 +0000
Subject: merge -r 1586-1593
 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
 Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873

---
 indra/llui/llfiltereditor.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llui/llfiltereditor.cpp')

diff --git a/indra/llui/llfiltereditor.cpp b/indra/llui/llfiltereditor.cpp
index 7d6a4007a2..26b5f2e182 100644
--- a/indra/llui/llfiltereditor.cpp
+++ b/indra/llui/llfiltereditor.cpp
@@ -44,6 +44,7 @@ LLFilterEditor::LLFilterEditor(const LLFilterEditor::Params& p)
 	line_editor_p.rect(getLocalRect());
 	line_editor_p.follows.flags(FOLLOWS_ALL);
 	line_editor_p.text_pad_right(getRect().getHeight());
+	line_editor_p.revert_on_esc(false);
 	line_editor_p.keystroke_callback(boost::bind(&LLUICtrl::onCommit, this));
 
 	mFilterEditor = LLUICtrlFactory::create<LLLineEditor>(line_editor_p);
-- 
cgit v1.2.3