diff options
| author | Cho <cho@lindenlab.com> | 2013-01-23 20:23:35 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-23 20:23:35 +0000 |
| commit | 9312cd8709132835878bdbe17f81d1b3e9fa7f45 (patch) | |
| tree | 3805fbb319ed2db13c032accbdfd3e9a13e87fd1 /indra/llui/lllineeditor.cpp | |
| parent | e6000d5930dd646bb15951336670bab4950515d8 (diff) | |
| parent | 977d318ac8ccb756bb90a8572f01bc6825b5d0a3 (diff) | |
merging latest changes
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 48d49af588..2e64be89fa 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -157,8 +157,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) mHighlightColor(p.highlight_color()), mPreeditBgColor(p.preedit_bg_color()), mGLFont(p.font), - mContextMenuHandle(), - mAutoreplaceCallback() + mContextMenuHandle() { llassert( mMaxLengthBytes > 0 ); @@ -971,12 +970,6 @@ void LLLineEditor::addChar(const llwchar uni_char) LLUI::reportBadKeystroke(); } - if (!mReadOnly && mAutoreplaceCallback != NULL) - { - // call callback - mAutoreplaceCallback(mText, mCursorPos); - } - getWindow()->hideCursorUntilMouseMove(); } |