summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroupinvite.cpp
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2009-12-30 00:45:11 -0500
committerKent Quirk <q@lindenlab.com>2009-12-30 00:45:11 -0500
commitf4e2287175ab1bc9d09fc73435a828071b9e2ba5 (patch)
treea3e863efea52678e6ea3f19302bef1d5500fcf42 /indra/newview/llpanelgroupinvite.cpp
parent904de223b6da701e2512b8d8bf0d3be478421c78 (diff)
parent383cb255e0ff619fa4ee3fc0b1dc6a37643d3bc1 (diff)
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/llpanelgroupinvite.cpp')
-rw-r--r--indra/newview/llpanelgroupinvite.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index 375ee0fdc4..06a682c905 100644
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -292,8 +292,8 @@ void LLPanelGroupInvite::impl::callbackClickAdd(void* userdata)
LLFloater* parentp;
parentp = gFloaterView->getParentFloater(panelp);
- parentp->addDependentFloater(LLFloaterAvatarPicker::show(callbackAddUsers,
- panelp->mImplementation,
+ parentp->addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(impl::callbackAddUsers, _1, _2,
+ panelp->mImplementation),
TRUE));
}
}