diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-10 11:41:59 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-10 11:41:59 -0400 |
| commit | a37f7ec200963ab97ecd0bc4059ecf4e94fe9232 (patch) | |
| tree | d1a2ce3f58dfffb806ea45b0669bf3d0b9d9d987 /indra/llui/lllineeditor.cpp | |
| parent | 388318c5328d002e316d27500dc91560d176b414 (diff) | |
| parent | 9370ffac47665c309c28fb075b26d8da43192e23 (diff) | |
automated merge
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 45f9de8e8d..c93ca1af88 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -377,7 +377,10 @@ void LLLineEditor::setText(const LLStringExplicit &new_text) setCursor(llmin((S32)mText.length(), getCursor())); // Set current history line to end of history. - mCurrentHistoryLine = mLineHistory.end() - 1; + if(mLineHistory.end() != mLineHistory.begin()) + { + mCurrentHistoryLine = mLineHistory.end() - 1; + } mPrevText = mText; } |