diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-08-26 17:12:29 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-08-26 17:12:29 -0700 |
| commit | fe7be11710a6a6cac924d4dbb6d9c890f8bc61a9 (patch) | |
| tree | d0aa9582700a1ff9914e072f61d9e8ede367348a /indra | |
| parent | 4b9abaaab9448df7e0773cdbaf1a5202a1f9e6c7 (diff) | |
| parent | 5a6a792920bb0dee35bcd711bd786d907bda556a (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_region_debug_console.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 17e41d9e24..3ba9bd4d1b 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1569,7 +1569,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/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml index cf95257b0a..b3bf28e285 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 @@ -10,6 +10,7 @@ default_tab_group="1"> <text_editor left="10" + read_only="true" type="string" length="1" follows="left|top|right|bottom" @@ -19,6 +20,7 @@ ignore_tab="false" layout="topleft" max_length="65536" + track_end="true" name="region_debug_console_output" show_line_numbers="false" word_wrap="true" |