diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
| commit | 53ce47fc1c2a713c6d7dd7fd9f98e50de727b974 (patch) | |
| tree | fcc220f37f0de56d63c5f501e7c577463106eb69 /indra/llui/llmenugl.cpp | |
| parent | f36cf6f1bad7e239011ab3ad40dca8002f42083c (diff) | |
| parent | 395a29717026221255d8bed57098afa52c49bff9 (diff) | |
merge changes for STORM-1654
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 6cac841cde..3ef8d8ff35 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -947,7 +947,7 @@ LLMenuItemBranchGL::LLMenuItemBranchGL(const LLMenuItemBranchGL::Params& p) LLMenuItemBranchGL::~LLMenuItemBranchGL() { - LLView::deleteViewByHandle(mBranchHandle); + delete mBranchHandle.get(); } // virtual @@ -1731,7 +1731,7 @@ void LLMenuGL::setCanTearOff(BOOL tear_off) { LLMenuItemTearOffGL::Params p; mTearOffItem = LLUICtrlFactory::create<LLMenuItemTearOffGL>(p); - addChildInBack(mTearOffItem); + addChild(mTearOffItem); } else if (!tear_off && mTearOffItem != NULL) { |