diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-17 15:23:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-17 15:23:01 -0500 |
| commit | 4ecf93fda2f2a30def5197b4f141b3abdbdc8b4e (patch) | |
| tree | c11c51aed31c8372b5c59d4006337414b870cb92 /indra/llui/lltextbase.cpp | |
| parent | d0de833d947b219eabae01abbb5750ad05e5e305 (diff) | |
| parent | 3b86582fb8fd809273d152197f72de2c59a29f24 (diff) | |
merge fix for STORM-563
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()); } |