From 9db7d6cb3d216fcdc1b6528039dc6538b045819e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 24 Aug 2010 09:41:35 -0700
Subject: fix for sim console not staying scrolled to bottom

---
 indra/llui/lltextbase.cpp                                   |  5 ++++-
 indra/newview/llfloaterregiondebugconsole.cpp               | 13 +++++--------
 .../skins/default/xui/en/floater_region_debug_console.xml   |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 3792f18c97..0390ff5fa4 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1597,7 +1597,10 @@ void LLTextBase::setText(const LLStringExplicit &utf8str, const LLStyle::Params&
 	// appendText modifies mCursorPos...
 	appendText(text, false, input_params);
 	// ...so move cursor to top after appending text
-	startOfDoc();
+	if (!mTrackEnd)
+	{
+		startOfDoc();
+	}
 
 	onValueChange(0, getLength());
 }
diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp
index 058f894800..8885fa0cb1 100644
--- a/indra/newview/llfloaterregiondebugconsole.cpp
+++ b/indra/newview/llfloaterregiondebugconsole.cpp
@@ -55,11 +55,9 @@ public:
     /*virtual*/
     void result(const LLSD& content)
     {
-        std::string text = mOutput->getText();
+        std::string text = content.asString();
         text += '\n';
-        text += content.asString();
-        text += '\n';
-        mOutput->setText(text);
+        mOutput->appendText(text, true);
     };
 
     LLTextEditor * mOutput;
@@ -80,14 +78,13 @@ BOOL LLFloaterRegionDebugConsole::postBuild()
 void LLFloaterRegionDebugConsole::onInput(LLUICtrl* ctrl, const LLSD& param)
 {
 	LLLineEditor * input = static_cast<LLLineEditor*>(ctrl);
-	std::string text = mOutput->getText();
-    text += "\n\POST: ";
+	std::string text = "\\POST: ";
 	text += input->getText();
-	mOutput->setText(text);
+	mOutput->appendText(text, true);
 
     std::string url = gAgent.getRegion()->getCapability("SimConsole");
     LLHTTPClient::post(url, LLSD(input->getText()), new ::Responder(mOutput));
 
-	input->setText(std::string(""));
+	input->clear();
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
index 591d77340a..976fa35d3c 100644
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -9,6 +9,7 @@
   width="600">
   <text_editor
   left="10"
+  read_only="true" 
    type="string"
    length="1"
    follows="left|top|right|bottom"
@@ -18,6 +19,7 @@
    ignore_tab="false"
    layout="topleft"
    max_length="65536"
+    track_end="true" 
    name="region_debug_console_output"
    show_line_numbers="false" 
    word_wrap="true">
-- 
cgit v1.2.3