diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
| commit | 1bfdfcb7b9dd392459b012b0712237716c94a84c (patch) | |
| tree | bdc4dfb4ef49c209acbdc3e9dd633a5a8a29dbba /indra/newview/llfloatergodtools.cpp | |
| parent | ab954444154de43ee18575a3b0649d0f3045dfd8 (diff) | |
| parent | dab5ef9d881bc41bc4924102c939db25dd26e0d9 (diff) | |
Merge pull from vir/drano
Diffstat (limited to 'indra/newview/llfloatergodtools.cpp')
| -rw-r--r-- | indra/newview/llfloatergodtools.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index a34e0353ec..fb905eae11 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -1123,8 +1123,12 @@ bool LLPanelObjectTools::callbackSimWideDeletes( const LLSD& notification, const void LLPanelObjectTools::onClickSet() { + LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&LLPanelObjectTools::callbackAvatarID, this, _1,_2)); // grandparent is a floater, which can have a dependent - gFloaterView->getParentFloater(this)->addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&LLPanelObjectTools::callbackAvatarID, this, _1,_2))); + if (picker) + { + gFloaterView->getParentFloater(this)->addDependentFloater(picker); + } } void LLPanelObjectTools::onClickSetBySelection(void* data) |