diff options
author | Tofu Buzzard <no-email> | 2010-10-15 09:52:11 +0100 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2010-10-15 09:52:11 +0100 |
commit | ad033a4b35387a343f2204cda64ecb590888b60e (patch) | |
tree | 6b2191d8e082bc84e28b2bbaa4dcea95cf68a797 /indra/newview/llpanelblockedlist.h | |
parent | 393c819477b268aa0a05ec0a006e1dba27d6e6c6 (diff) | |
parent | 508686047d5e98934d5fefbb576e54f108df6fe3 (diff) |
sync up to viewer-developer
Diffstat (limited to 'indra/newview/llpanelblockedlist.h')
-rw-r--r-- | indra/newview/llpanelblockedlist.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h index eb9f082d87..74ad82e32d 100644 --- a/indra/newview/llpanelblockedlist.h +++ b/indra/newview/llpanelblockedlist.h @@ -36,7 +36,8 @@ // class LLLineEditor; // class LLMessageSystem; // class LLUUID; - class LLScrollListCtrl; +class LLAvatarName; +class LLScrollListCtrl; class LLPanelBlockedList : public LLPanel, public LLMuteListObserver @@ -72,7 +73,7 @@ private: void onPickBtnClick(); void onBlockByNameClick(); - void callbackBlockPicked(const std::vector<std::string>& names, const uuid_vec_t& ids); + void callbackBlockPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names); static void callbackBlockByName(const std::string& text); private: |