summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2010-11-27 13:08:00 +0000
committerTofu Buzzard <no-email>2010-11-27 13:08:00 +0000
commit31a109452d743af565f99029ec835e2f32261681 (patch)
tree07375d9174730e1deec3aedcc6333fe8426cd827 /indra/llui/lltextbase.cpp
parentb3541777921142572f735c4b028e4fba91ae80a0 (diff)
parent2f83766bb71772eda19a4c7c61896c0fd7fae8a4 (diff)
merge
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 5721df6b36..3f213ed13e 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());
}