diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-09-10 15:39:20 -0700 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-09-10 15:39:20 -0700 |
| commit | ac500df89e09cd133d60d309a20bd6fbf0cfefb7 (patch) | |
| tree | 5e41aa0fa947eecf10af41f9fa118fae8bd2416b /indra/llui | |
| parent | 1f46b1d87bf4664e62131e7823ab5a7fcafe4b73 (diff) | |
| parent | e98aeea556167ff415b29fbba1423b0e0803bb97 (diff) | |
Post-convert merge by convert_monolith.py from http://hg.lindenlab.com/brad/viewer-simconsole
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 2759167d04..0b5c820859 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1266,7 +1266,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask) // handle ctrl-uparrow if we have a history enabled line editor. case KEY_UP: - if( mHaveHistory && ( MASK_CONTROL == mask ) ) + if( mHaveHistory && ((mIgnoreArrowKeys == false) || ( MASK_CONTROL == mask )) ) { if( mCurrentHistoryLine > mLineHistory.begin() ) { @@ -1281,9 +1281,9 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask) } break; - // handle ctrl-downarrow if we have a history enabled line editor + // handle [ctrl]-downarrow if we have a history enabled line editor case KEY_DOWN: - if( mHaveHistory && ( MASK_CONTROL == mask ) ) + if( mHaveHistory && ((mIgnoreArrowKeys == false) || ( MASK_CONTROL == mask )) ) { if( !mLineHistory.empty() && mCurrentHistoryLine < mLineHistory.end() - 1 ) { diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 574b24cf13..7ff2d2d50c 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()); } |