summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-04-01 14:08:49 -0700
committerRichard Linden <none@none>2010-04-01 14:08:49 -0700
commit2be2fdca5c334b787b8019d7226a48e1d5eaec91 (patch)
tree9a458cb03c8f9d2e43e627be9edfa99bc8b4f9b6 /indra
parent09add95e314652bdb55200ad62a75c42326d69b4 (diff)
EXT-3606 - Script editor window: next line not indenting if current line wraps
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/lltexteditor.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_text_editor.xml1
2 files changed, 2 insertions, 1 deletions
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>