summaryrefslogtreecommitdiff
path: root/indra/newview/llchiclet.cpp
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-12-20 20:44:38 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2011-12-20 20:44:38 +0200
commit5dc8e44c767f839e3d2d1d926bfdeee969f2492e (patch)
tree56c89fffbde04a998c403156e50dc9e702f1b5ed /indra/newview/llchiclet.cpp
parent16b6a472477bd389771fe4022e425f77ca85c2bd (diff)
EXP-1499 FIXED Added some NULL checks in notifications UI code to avoid a crash on exit.
The crash happened if connection timed out while there were unread object inventory offers.
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r--indra/newview/llchiclet.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index a076374903..045c9017be 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -250,6 +250,12 @@ LLIMWellChiclet::LLIMWellChiclet(const Params& p)
LLIMWellChiclet::~LLIMWellChiclet()
{
+ LLIMWellWindow* im_well_window = LLIMWellWindow::findInstance();
+ if (im_well_window)
+ {
+ im_well_window->setSysWellChiclet(NULL);
+ }
+
LLIMMgr::getInstance()->removeSessionObserver(this);
}