summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-11-18 17:03:40 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2010-11-18 17:03:40 -0800
commite19ee531aedcbbe0f77a8ac11cdcda43c9c4ed84 (patch)
tree1c297e01c91d9aa851296cf371403daa0a243988 /indra/llui/lltextbase.cpp
parentcd30239eda5d8969db02c2c56d95332dd5039bb0 (diff)
parentc893c55d8a1328a134c956b70e6fef7fd7053d47 (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());
}