diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
| commit | 40e04fdb3b416a686c66989ee5d44c5eaf97b9fd (patch) | |
| tree | 537b95c75bdb4a96a9f663895f89cb73f54c8f67 /indra/newview/llscreenchannel.cpp | |
| parent | 70df3c1fa72ae8ecddf144452b4fe032ad48182e (diff) | |
| parent | 1a28e325c4d148d2322bc9becb672abf99315a96 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index a4426b370e..dffb5e5e12 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -710,9 +710,7 @@ void LLScreenChannel::hideToast(const LLUUID& notification_id) if(mToastList.end() != it) { ToastElem te = *it; - te.toast->setVisible(FALSE); - te.toast->stopTimer(); - mToastList.erase(it); + te.toast->hide(); } } |