diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
| commit | 2662c4b679f0eb2745619dc4fd1dd79af65126f0 (patch) | |
| tree | f27ba8675353676d91327fc606b005f0096b2fb9 /indra/llui/lllineeditor.cpp | |
| parent | 4b97f03b04e7df25e5b3622122f6d124d4a5f617 (diff) | |
| parent | 2002a39e4db5ba96f4a0a7653f76a3cd55846a31 (diff) | |
Merge. Pulling fix for VWR-25862 into bigger cache tree.
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index d99ee5a545..0196080d90 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -389,7 +389,11 @@ void LLLineEditor::setText(const LLStringExplicit &new_text) setCursor(llmin((S32)mText.length(), getCursor())); // Set current history line to end of history. - if(mLineHistory.end() != mLineHistory.begin()) + if (mLineHistory.empty()) + { + mCurrentHistoryLine = mLineHistory.end(); + } + else { mCurrentHistoryLine = mLineHistory.end() - 1; } |