summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-04 13:17:07 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-04 13:17:07 -0700
commit6be9f280ff5b2e2eba3bb9c3f14d7166579d1a49 (patch)
treefdf7ccbb8650d743426e3bddce82d15eb47943a2 /indra/newview
parenta97770b79a28cd205c9e4a4ddc05c209ee396d85 (diff)
Reverting commenting out of code since fix is in
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llavataractions.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index ebd8296fda..02dbfd0af6 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -643,12 +643,11 @@ namespace action_give_inventory
//static
void LLAvatarActions::shareWithAvatars()
{
- llerrs << "Needs to be fixed to work with LLAvatarName" << llendl;
-// using namespace action_give_inventory;
-//
-// LLFloaterAvatarPicker* picker =
-// LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2), TRUE, FALSE);
-// picker->setOkBtnEnableCb(boost::bind(is_give_inventory_acceptable));
+ using namespace action_give_inventory;
+
+ LLFloaterAvatarPicker* picker =
+ LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2), TRUE, FALSE);
+ picker->setOkBtnEnableCb(boost::bind(is_give_inventory_acceptable));
}
// static