diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-19 17:58:50 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-19 17:58:50 +0200 |
| commit | 6212054ff99372d16b470773a6415f0432a33ece (patch) | |
| tree | f3f26ef3f5745dfdc29d6ef26e405d2edbf69666 | |
| parent | 82de841c52357642d30b6d89b11da079f9c0f5d1 (diff) | |
| parent | bde7830bf531245570d5754e71f5724ead72dfc1 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
| -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. |