summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-05-28 09:06:58 -0700
committerCallum Prentice <callum@lindenlab.com>2014-05-28 09:06:58 -0700
commit038f250caea80e21192372019dca8fdcf269c0d9 (patch)
tree2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/llui/lltexteditor.cpp
parentfbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff)
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
Merge with head of 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 494666df8a..c797b6acc5 100755
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2338,7 +2338,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++;