diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-26 16:35:37 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-26 16:35:37 -0700 |
| commit | b2234485b27477822f2bc0fcbd07aa18f11d1cab (patch) | |
| tree | 83d6b7517ad7dae44e0204b0941c996f698f0bd8 /indra/newview/llchathistory.cpp | |
| parent | dde671f1df7fd7a6930148833ab5eecaf328f6f9 (diff) | |
| parent | 2b68fd569d4da24e31e0f9e5309e155a7567d5a0 (diff) | |
Merge
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); |