diff options
author | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:50:24 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:50:24 -0700 |
commit | 39ee2367a7e771890017fc3d663780437ea69bb2 (patch) | |
tree | b84c3ade59dba5ae032a3123afb9c3c5f78c9b68 /indra/newview/llfloaterscriptdebug.cpp | |
parent | 374deb8da13c63f80dc1b245488eb254eb86f5d2 (diff) | |
parent | 6ef3f20933c5df684298bc1b8f338ce9dfd49070 (diff) |
Merging due to changes since my last pull.
Diffstat (limited to 'indra/newview/llfloaterscriptdebug.cpp')
-rw-r--r-- | indra/newview/llfloaterscriptdebug.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp index 328fb6450e..3bf1848efb 100644 --- a/indra/newview/llfloaterscriptdebug.cpp +++ b/indra/newview/llfloaterscriptdebug.cpp @@ -167,6 +167,7 @@ void LLFloaterScriptDebugOutput::addLine(const std::string &utf8mesg, const std: setShortTitle(user_name); } - mHistoryEditor->appendColoredText(utf8mesg, false, true, color); + mHistoryEditor->appendText(utf8mesg, true, LLStyle::Params().color(color)); + mHistoryEditor->blockUndo(); } |