diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-08 10:48:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-08 10:48:26 -0500 |
| commit | 3763386987bd7ab42438a1f1bdf3a78283bcbf51 (patch) | |
| tree | b45814d100958d0adb07100440888c56200a5a9a /indra/llui/llmenugl.cpp | |
| parent | 66555b844dfcdb1bbbab472967a90060c5d0838f (diff) | |
| parent | 757a955bd700eb4f838762dcbe789a77ee052064 (diff) | |
merge changes for vmrg-213
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index cb237fca7c..95ecbb1c94 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -947,9 +947,14 @@ LLMenuItemBranchGL::LLMenuItemBranchGL(const LLMenuItemBranchGL::Params& p) LLMenuItemBranchGL::~LLMenuItemBranchGL() { - delete mBranchHandle.get(); + if (mBranchHandle.get()) + { + mBranchHandle.get()->die(); + } } + + // virtual LLView* LLMenuItemBranchGL::getChildView(const std::string& name, BOOL recurse) const { |