diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
| commit | d65e512fa3a0e7bc7f1c269d2c8d2e1c38c4e970 (patch) | |
| tree | 324168722ec39359f4753aa4acf6ca65c8b72ab3 /indra/llui/lllineeditor.cpp | |
| parent | d3e71fdc2c35ab75ebdac573698bbb86bbd0d98f (diff) | |
| parent | d3a9d6a6cef6630995c652b4cc04c8807dbe6d4e (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 2759167d04..a1fc977ce1 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1271,7 +1271,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask) if( mCurrentHistoryLine > mLineHistory.begin() ) { mText.assign( *(--mCurrentHistoryLine) ); - setCursor(llmin((S32)mText.length(), getCursor())); + setCursorToEnd(); } else { @@ -1288,7 +1288,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask) if( !mLineHistory.empty() && mCurrentHistoryLine < mLineHistory.end() - 1 ) { mText.assign( *(++mCurrentHistoryLine) ); - setCursor(llmin((S32)mText.length(), getCursor())); + setCursorToEnd(); } else { |