diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2012-02-13 17:12:03 +0200 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2012-02-13 17:12:03 +0200 |
| commit | 47425d67fe032804d8a10123cd1a7daf9bff84f7 (patch) | |
| tree | 775b68e9333cd13826daf9b870da387e365186dc /indra/newview/llfloatergodtools.cpp | |
| parent | 3e2eca7c1f215ff42844d6cf40bff4498ced457e (diff) | |
EXP-1882 FIXED Crashes when invoking avatar picker from mouse look mode.
Fixing the cases missed in EXP-1879.
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) |