summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-01-19 17:58:17 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-01-19 17:58:17 +0200
commitbde7830bf531245570d5754e71f5724ead72dfc1 (patch)
treefa78f079e87ce885f67cd0a7d13e086311cf6458
parent00c05a885fb1cbee967065798f57d74bf47f2478 (diff)
fixed EXT-4478 “Memory leak in LLChicletPanel”,
added destroying chiclet on chiclet panel item remove event; made LLIMChiclet destructor virtual; --HG-- branch : product-engine
-rw-r--r--indra/newview/llchiclet.cpp1
-rw-r--r--indra/newview/llchiclet.h2
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.