diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-25 17:09:20 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-25 17:09:20 +0200 |
| commit | 920d54297fc13a7a975ff4372f0c1559cf9cf199 (patch) | |
| tree | fd557a25ed48a07624fb93745c3582622fc948e5 /indra/newview/llchathistory.cpp | |
| parent | 0f32c14cab77717dab75b8d91302104e8f168ceb (diff) | |
fixed major EXT-6500 “Message Well counter changes to '-1' after
plain text chat was enabled while unresolved offer was in hided IM window”,
Added check to LLToastNotifyPanel destructor whether we should close
notification since notification will be reused by IM floater when reload
messages, the rule is: if LLToastNotifyPanel destroying but IM floater is
exists – we shouldn't close notification.
The problem is that notification was incorrectly deleted when IM floater
reloads messages on chat log fromat change event.
reviewed by Vadim Savchuk at
https://codereview.productengine.com/secondlife/r/80/
--HG--
branch : product-engine
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 efdfbb8d20..858ea334d1 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -751,7 +751,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL if (notification != NULL) { LLIMToastNotifyPanel* notify_box = new LLIMToastNotifyPanel( - notification); + notification, chat.mSessionID); //we can't set follows in xml since it broke toasts behavior notify_box->setFollowsLeft(); notify_box->setFollowsRight(); |