diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-01-26 14:33:28 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-01-26 14:33:28 -0800 |
| commit | a87cbadf16cb8a32ea78fb605403472ee866bccf (patch) | |
| tree | 07b4eb3d31491ca30d02952442ce53b1cd426c55 /indra/llui/lltextbase.cpp | |
| parent | 3f7ed7ef1de1012e3bea719e8042a256deb10ac3 (diff) | |
| parent | fee564c26e1018787cf70b95fc677c1da447118c (diff) | |
Merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 3 |
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(); } |