diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2009-12-28 17:44:54 +0200 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2009-12-28 17:44:54 +0200 |
| commit | d89793616e32cace99b5b76e47d51d141b20c7f2 (patch) | |
| tree | f03c883f185d77951699d71c06b52c9103649f4e /indra/newview/llpanelblockedlist.cpp | |
| parent | 79fba14bd4ba88dfe71546f5f679ed79fdeff66a (diff) | |
implemented minor task EXT-3454 Code improvements: Replace old-style calback with boost::function in the LLFloaterAvatarPicker
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelblockedlist.cpp')
| -rw-r--r-- | indra/newview/llpanelblockedlist.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp index ae703ebd8e..362657a458 100644 --- a/indra/newview/llpanelblockedlist.cpp +++ b/indra/newview/llpanelblockedlist.cpp @@ -171,7 +171,7 @@ void LLPanelBlockedList::onPickBtnClick() { const BOOL allow_multiple = FALSE; const BOOL close_on_select = TRUE; - /*LLFloaterAvatarPicker* picker = */LLFloaterAvatarPicker::show(callbackBlockPicked, this, allow_multiple, close_on_select); + /*LLFloaterAvatarPicker* picker = */LLFloaterAvatarPicker::show(boost::bind(&LLPanelBlockedList::callbackBlockPicked, this, _1, _2), allow_multiple, close_on_select); // *TODO: mantipov: should LLFloaterAvatarPicker be closed when panel is closed? // old Floater dependency is not enable in panel @@ -183,8 +183,7 @@ void LLPanelBlockedList::onBlockByNameClick() LLFloaterGetBlockedObjectName::show(&LLPanelBlockedList::callbackBlockByName); } -//static -void LLPanelBlockedList::callbackBlockPicked(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data) +void LLPanelBlockedList::callbackBlockPicked(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) { if (names.empty() || ids.empty()) return; LLMute mute(ids[0], names[0], LLMute::AGENT); |