summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.cpp
diff options
context:
space:
mode:
authorStinson Linden <stinson@lindenlab.com>2014-05-19 22:19:55 +0100
committerStinson Linden <stinson@lindenlab.com>2014-05-19 22:19:55 +0100
commitbabd89b77050ab49166f2fbd6d460884070140d9 (patch)
treedd3039e009f3e0f7ca2de578f4599e79ca15a1dc /indra/llui/lltexteditor.cpp
parent08e83a341e76de8fa4d8c4a974edbe3e0bd1c128 (diff)
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rwxr-xr-xindra/llui/lltexteditor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 517142bf17..b4ebed0849 100755
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2339,7 +2339,8 @@ void LLTextEditor::autoIndent()
S32 i;
LLWString text = getWText();
- while( ' ' == text[line_start] )
+ S32 offset = getLineOffsetFromDocIndex(mCursorPos);
+ while(( ' ' == text[line_start] ) && (space_count < offset))
{
space_count++;
line_start++;