diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 17:47:20 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 17:47:20 +0200 |
commit | 6146cfc5c1c14f106b54b7394db6286d9b7bb67a (patch) | |
tree | f29e14c852a36d1b97defd0f126068deec8ed3b6 /indra/newview/llpanelteleporthistory.cpp | |
parent | 61fdd33f7916dbf13c5c56e2d4c0ccb14fdae150 (diff) | |
parent | 062d0a13db505636b186084d42c527a49637f380 (diff) |
Merge from default branch
--HG--
branch : product-engine
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; } |