summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-26 10:36:27 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-26 10:36:27 -0800
commit3d771ed88b1f40ca0a5869530d729a58000ef028 (patch)
treeaabf54705b60159d791944019dcc48c79b1ed0ff /indra/llui/lltextbase.cpp
parent020f855f643a198737e7bd4066bdc1757d864a54 (diff)
parentd72748a0af3e77de9a5dfedd2b8c9d87bfe7da24 (diff)
PE merge.
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index ab0d9b2221..8abbc833e5 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -244,7 +244,8 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
LLTextBase::~LLTextBase()
{
- delete mPopupMenu;
+ // Menu, like any other LLUICtrl, is deleted by its parent - gMenuHolder
+
clearSegments();
}