diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-04 13:11:15 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-04 13:11:15 -0700 |
| commit | a97770b79a28cd205c9e4a4ddc05c209ee396d85 (patch) | |
| tree | 32eda047631c697df3309b7ef29fd77fdbd40c31 | |
| parent | 36ff13ddf01966260d304605d1d5cb3201389c84 (diff) | |
| parent | 9696e94b2453e631f2c3bbb437e34196bc34652b (diff) | |
Merge
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llavataractions.cpp | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4178b91fcf..c05c08168a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7445,7 +7445,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>RenderInitError</key> <map> diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 02dbfd0af6..ebd8296fda 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -643,11 +643,12 @@ namespace action_give_inventory //static void LLAvatarActions::shareWithAvatars() { - 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)); + 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)); } // static |