diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
| commit | bc54f1bb89452467ca8b652e4b961444d9c4be8d (patch) | |
| tree | b5aac588bc7ec1506456eaf5967e9a7930b42fc0 /indra/newview/llfloatergodtools.cpp | |
| parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Merge : pull from lindenlab/viewer-release
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) |