diff options
| author | richard <none@none> | 2009-11-10 12:05:36 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-10 12:05:36 -0800 |
| commit | 595000c19c0499a0b612c272cd097a8f1ca578bd (patch) | |
| tree | dc88a193c3275b23bcc2efb1180ff5eb1e90fac9 /indra/newview/llpanelteleporthistory.cpp | |
| parent | ecf8f5c5beda9f5fa743c4666717c4378f204023 (diff) | |
| parent | 1eaab29a95439c6688c903b224e660de0fc9a053 (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; } |