From 2be2fdca5c334b787b8019d7226a48e1d5eaec91 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 1 Apr 2010 14:08:49 -0700
Subject: EXT-3606 - Script editor window: next line not indenting if current
line wraps
---
indra/llui/lltexteditor.cpp | 2 +-
indra/newview/skins/default/xui/en/floater_test_text_editor.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 7d230f7d42..94c7ebec2a 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2334,7 +2334,7 @@ void LLTextEditor::getCurrentLineAndColumn( S32* line, S32* col, BOOL include_wo
void LLTextEditor::autoIndent()
{
// Count the number of spaces in the current line
- S32 line = getLineNumFromDocIndex(mCursorPos);
+ S32 line = getLineNumFromDocIndex(mCursorPos, false);
S32 line_start = getLineStart(line);
S32 space_count = 0;
S32 i;
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
index b730f0e511..548e24efba 100644
--- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -14,6 +14,7 @@
name="test_text_editor"
tool_tip="text editor"
top="25"
+ word_wrap="true"
width="200">
Text Editor
</text_editor>
--
cgit v1.2.3