diff options
| author | Dave Parks <none@none> | 2010-06-08 23:13:05 -0500 |
|---|---|---|
| committer | Dave Parks <none@none> | 2010-06-08 23:13:05 -0500 |
| commit | c2da9f5d2cc86af0af34199c53e872fbff22637b (patch) | |
| tree | 326f7e77cf619eb81c5838791b2e4f0a60a032d4 /indra/llui/lllineeditor.cpp | |
| parent | 2cfc9f57bb22ab732cdc55b5e48ff9a05040d05a (diff) | |
| parent | 22102e41cbf4ce9e1c0d069f111849466e297520 (diff) | |
Merge with viewer-experimental
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 45f9de8e8d..c0cc294c02 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -377,7 +377,14 @@ 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.empty()) + { + mCurrentHistoryLine = mLineHistory.end(); + } + else + { + mCurrentHistoryLine = mLineHistory.end() - 1; + } mPrevText = mText; } |