diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-11 14:18:36 -0800 |
| commit | 9f8959d480d1069f554c576a4cc9a494559ef1e4 (patch) | |
| tree | 7ae4f550c1039cdb15d0087a0511310dddf8b5a5 /indra/newview/llfloatergodtools.cpp | |
| parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
| parent | 573ab07a40acc78e28ae390331d862d3f858bb07 (diff) | |
Pull merge from 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); } } |