diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-26 17:05:29 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-26 17:05:29 -0400 |
| commit | 32253813b4d885f2a62a02f55ab249bca01c6cdf (patch) | |
| tree | e1431274f69991f9ed16d0f6984a6d132f2729ca /indra/newview/llchathistory.cpp | |
| parent | 1ed3117a6d3d40788245d2b28f2ed7a82380b4bb (diff) | |
EXT-3818 -- absolute minimal fix for Viewer 2, can be better fixed in 2.1. Previous proposed fix caused a crash on at least one machine, too risky.
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index efdfbb8d20..f5faeca126 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -646,7 +646,8 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL p.left_pad = mLeftWidgetPad; p.right_pad = mRightWidgetPad; p.view = separator; - mEditor->appendWidget(p, "\n", false); + //mEditor->appendWidget(p, "\n", false); // TODO: this is absolute minimal fix for EXT-3818 because it's late for 2.0 + mEditor->appendWidget(p, "", false); // This should be properly fixed in 2.1 mEditor->appendText("[" + chat.mTimeStr + "] ", mEditor->getText().size() != 0, style_params); |