diff options
author | James Cook <james@lindenlab.com> | 2009-11-28 21:25:53 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-28 21:25:53 -0800 |
commit | 5531149ad1190ffe2adb14b7df7dbf6a1f2f5365 (patch) | |
tree | 7e1fd5a0da7d2eeac9b57fa49a1f6bf94a23fcc4 | |
parent | e8b436591ad198a5aa37d51077e2d5b0d5b62562 (diff) |
Fix merge error
-rw-r--r-- | indra/llui/lltexteditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 2df7d12704..628d566179 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2162,7 +2162,7 @@ void LLTextEditor::drawLineNumbers() return; } - S32 cursor_line = getLineNumFromDocIndex(mCursorPos); + S32 cursor_line = mLineInfoList[getLineNumFromDocIndex(mCursorPos)].mLineNum; if (mShowLineNumbers) { |