diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-13 18:42:48 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-13 18:42:48 +0100 |
| commit | 1dea2536d9d5a2cc7548a93f99e175aad53181c0 (patch) | |
| tree | 9346d208db10538ca258c6d18b63d19a6c91cc24 /indra/newview/llchathistory.cpp | |
| parent | 0389188954b2492d37deb08a30687410302751b8 (diff) | |
| parent | 9e49a5302e3bd4e12480b9bc3d8f435f75f444b6 (diff) | |
merge storm-114
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 1f67a659bd..dfb1db523d 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -760,7 +760,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL if (notification != NULL) { LLIMToastNotifyPanel* notify_box = new LLIMToastNotifyPanel( - notification, chat.mSessionID); + notification, chat.mSessionID, LLRect::null, !use_plain_text_chat_history); //we can't set follows in xml since it broke toasts behavior notify_box->setFollowsLeft(); notify_box->setFollowsRight(); |