diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-04 15:04:38 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-04 15:04:38 -0800 |
| commit | 53abe3c7802b8c8579ce868b4ecb05d9ebdd20ef (patch) | |
| tree | 4a2c9b325f6ceb75403db9d29e1efa583de434e3 /indra/newview/llfloaterfriends.h | |
| parent | 34328eed67a10ccca73ec78cd70488ac35f2ee91 (diff) | |
| parent | 1355d16d2f24f9d623df70059b1f0001cf673209 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterfriends.h')
| -rw-r--r-- | indra/newview/llfloaterfriends.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h index 9c6660c0dc..0042da48d3 100644 --- a/indra/newview/llfloaterfriends.h +++ b/indra/newview/llfloaterfriends.h @@ -116,7 +116,7 @@ private: static void onSelectName(LLUICtrl* ctrl, void* user_data); static bool callbackAddFriend(const LLSD& notification, const LLSD& response); static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response); - static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data); + static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); static void onMaximumSelect(); static void onClickIM(void* user_data); |