summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-09-10 15:39:20 -0700
committerAndrew Meadows <andrew@lindenlab.com>2010-09-10 15:39:20 -0700
commitac500df89e09cd133d60d309a20bd6fbf0cfefb7 (patch)
tree5e41aa0fa947eecf10af41f9fa118fae8bd2416b /indra/llui/lltextbase.cpp
parent1f46b1d87bf4664e62131e7823ab5a7fcafe4b73 (diff)
parente98aeea556167ff415b29fbba1423b0e0803bb97 (diff)
Post-convert merge by convert_monolith.py from http://hg.lindenlab.com/brad/viewer-simconsole
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 574b24cf13..7ff2d2d50c 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1591,7 +1591,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());
}