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/llpanelpeoplemenus.cpp | |
parent | 0eaf4b2bb27eec073d39bb6134193be905d8b6a9 (diff) | |
parent | 5f5a5b12eda3f9bd7c2c86961dbe1753c1f21f0b (diff) |
Merge with tip
Diffstat (limited to 'indra/newview/llpanelpeoplemenus.cpp')
-rw-r--r-- | indra/newview/llpanelpeoplemenus.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp index aaf6849fe9..7dea5eaf67 100644 --- a/indra/newview/llpanelpeoplemenus.cpp +++ b/indra/newview/llpanelpeoplemenus.cpp @@ -64,7 +64,6 @@ void ContextMenu::show(LLView* spawning_view, const std::vector<LLUUID>& uuids, if (parent) { parent->removeChild(mMenu); - mMenu->setParent(NULL); } delete mMenu; mMenu = NULL; |