diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-17 15:21:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-17 15:21:16 -0500 |
| commit | f526f641d887f4a30884d55d63e2aa3898b2fd30 (patch) | |
| tree | f5a252426ff17df27ffa6f2fed15e9d30781352a /indra/llui/lltextbase.cpp | |
| parent | 7e9572fab5643f52a44f06249109f7e77b656e3b (diff) | |
| parent | 289e1f330998e7d32ff16048c543b5a7270d9016 (diff) | |
merge fix for STORM-589
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()); } |