diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-19 18:25:29 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-19 18:25:29 +0200 |
| commit | c008e692b5a92c6c70dd9fe1098dcc735c98d5a2 (patch) | |
| tree | 4a17ba272b8d95bc16dd7bc43561f64ec1ec028e /indra/newview | |
| parent | ac8f5e6f91dab3c3cb9c2fb2ed0274e71f17f1bb (diff) | |
| parent | 6212054ff99372d16b470773a6415f0432a33ece (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llchiclet.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index f21fbbe6f5..1d739f07b1 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -1297,6 +1297,7 @@ void LLChicletPanel::removeChiclet(chiclet_list_t::iterator it) mChicletList.erase(it); arrange(); + (*it)->die(); } void LLChicletPanel::removeChiclet(S32 index) diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h index ae5b2148db..bb4846aa57 100644 --- a/indra/newview/llchiclet.h +++ b/indra/newview/llchiclet.h @@ -325,7 +325,7 @@ public: }; - /*virtual*/ ~LLIMChiclet() {}; + virtual ~LLIMChiclet() {}; /** * Sets IM session name. This name will be displayed in chiclet tooltip. |