diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
| commit | e271c47994fc9dd86bda9d6ad7e79799229e52aa (patch) | |
| tree | 39a95ca75541cab5952708b6cfed741394bf9e9c /indra/newview/llfloatergodtools.cpp | |
| parent | 8cd5d361600f34a0a7fa504a721bea3301191644 (diff) | |
| parent | d41202336b7c797bc3fe4feffa8be2164518e845 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloatergodtools.cpp')
| -rw-r--r-- | indra/newview/llfloatergodtools.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index fb905eae11..38abdcc830 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -1123,11 +1123,13 @@ bool LLPanelObjectTools::callbackSimWideDeletes( const LLSD& notification, const void LLPanelObjectTools::onClickSet() { - LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&LLPanelObjectTools::callbackAvatarID, this, _1,_2)); + LLView * button = findChild<LLButton>("Set Target"); + LLFloater * root_floater = gFloaterView->getParentFloater(this); + LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&LLPanelObjectTools::callbackAvatarID, this, _1,_2), FALSE, FALSE, FALSE, root_floater->getName(), button); // grandparent is a floater, which can have a dependent if (picker) { - gFloaterView->getParentFloater(this)->addDependentFloater(picker); + root_floater->addDependentFloater(picker); } } |