hg merge

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 5a46c7c98e..9bd445988d 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -592,6 +592,10 @@ void LLTextEditor::indentSelectedLines( S32 spaces )
 			}
 		}
 
+		// Disabling parsing on the fly to avoid updating text segments
+		// until all indentation commands are executed.
+		mParseOnTheFly = FALSE;
+
 		// Find each start-of-line and indent it
 		do
 		{
@@ -617,6 +621,8 @@ void LLTextEditor::indentSelectedLines( S32 spaces )
 		}
 		while( cur < right );
 
+		mParseOnTheFly = TRUE;
+
 		if( (right < getLength()) && (text[right] == '\n') )
 		{
 			right++;