diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-01-03 10:38:06 -0800 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-03 10:38:06 -0800 |
commit | 3fd7752f1289f67db93e76833cc9804d057bc3c8 (patch) | |
tree | 4fe65b7a3c80b065aa19e4904ea8e0d0d0e56940 /indra/newview/llchiclet.cpp | |
parent | d1e79837d1b07cec0297a20e3cb63a47b136d844 (diff) | |
parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (diff) |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r-- | indra/newview/llchiclet.cpp | 6 |
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); } |