diff options
| author | callum <none@none> | 2009-11-10 15:51:41 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-10 15:51:41 -0800 |
| commit | c50072b5482bea46f62931e075f811fbce92293d (patch) | |
| tree | f76f50b8d3327e270df511d56d7da9482f903010 /indra/newview/llpanelteleporthistory.cpp | |
| parent | 0eaf4b2bb27eec073d39bb6134193be905d8b6a9 (diff) | |
| parent | 5f5a5b12eda3f9bd7c2c86961dbe1753c1f21f0b (diff) | |
Merge with tip
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; } |