diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
| commit | 652c8f6b5e91e1333854ac5e300b0bf650d03fc2 (patch) | |
| tree | 4c0375dddbf315baa73c30fe648eb0915f3e3f2a /indra/newview/llpanelteleporthistory.cpp | |
| parent | af9b99b457a6a6ab9f04a20bcde6a90091321375 (diff) | |
| parent | 062d0a13db505636b186084d42c527a49637f380 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
| -rw-r--r-- | indra/newview/llpanelteleporthistory.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp index 72856d5b82..057cdde6f0 100644 --- a/indra/newview/llpanelteleporthistory.cpp +++ b/indra/newview/llpanelteleporthistory.cpp @@ -163,7 +163,6 @@ void LLTeleportHistoryPanel::ContextMenu::show(LLView* spawning_view, S32 index, if (parent) { parent->removeChild(mMenu); - mMenu->setParent(NULL); } delete mMenu; } @@ -658,7 +657,6 @@ void LLTeleportHistoryPanel::onAccordionTabRightClick(LLView *view, S32 x, S32 y if (parent) { parent->removeChild(mAccordionTabMenu); - mAccordionTabMenu->setParent(NULL); } delete mAccordionTabMenu; } |