diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-17 15:22:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-17 15:22:05 -0500 |
| commit | 3b86582fb8fd809273d152197f72de2c59a29f24 (patch) | |
| tree | 4f51bb96564c454bde64ab74897e458f0f77a80a /indra/llui/lltextbase.cpp | |
| parent | 00ada8dccd50cf04e5ea16f200ce3c6bfbee5023 (diff) | |
| parent | f526f641d887f4a30884d55d63e2aa3898b2fd30 (diff) | |
merge fix for STORM-588
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
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()); } |