diff options
| author | Richard Linden <none@none> | 2012-02-23 12:39:59 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-23 12:39:59 -0800 |
| commit | 48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (patch) | |
| tree | ec895147f9ccd201203e9b23433b9bb921278f03 /indra/newview/llfloatergodtools.cpp | |
| parent | 11d29660aa84a1a8a61e427698715497a57243c2 (diff) | |
| parent | 9da67fff0a21ae7af2f99c90be267b089eaafeb6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
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) |