diff options
| author | richard <none@none> | 2009-11-09 16:14:52 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-09 16:14:52 -0800 |
| commit | 3b2d9f63e3a54660a8657ec573cce3f29f677047 (patch) | |
| tree | 2f51c9bc9a04a639ff3ac6851917f4f4df89bd0b /indra/newview/llpanelteleporthistory.cpp | |
| parent | f4a7de3bb5a837df43525ac936000fd67177ea42 (diff) | |
| parent | 2bc97bd68a774dd373c5688b5dc660abe90b37cc (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; } |