diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-12 14:10:44 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-12 14:10:44 +0300 |
| commit | fbaae0a2df3b68756c7d910438041887d018cd63 (patch) | |
| tree | aceb50a59cb304de950abfb7dc7f0060b8f7bb94 /indra/newview/lltoastnotifypanel.cpp | |
| parent | 36e84baea4510369e1f947c46368d93995a1f9fb (diff) | |
| parent | 367b77eb1b87ba55fd4a94e9b2630a7d002d4399 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 089163929e..9275ca4f42 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -291,7 +291,10 @@ LLToastNotifyPanel::~LLToastNotifyPanel() { // let reusable notification be deleted mNotification->setReusable(false); - LLNotifications::getInstance()->cancel(mNotification); + if (!mNotification->isPersistent()) + { + LLNotifications::getInstance()->cancel(mNotification); + } } } |