diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-12 06:27:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-12 06:27:13 +0000 |
| commit | da94c0eaa2ce2711f0ae26968e87ef3e409126a9 (patch) | |
| tree | e0b23896f17e0a0ea60160b2c7e39331f3cb9668 /indra/newview/llfloaterfriends.h | |
| parent | 642cdd95726755b7c24c7f2b25e2fea8e49b5b9b (diff) | |
QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
Diffstat (limited to 'indra/newview/llfloaterfriends.h')
| -rw-r--r-- | indra/newview/llfloaterfriends.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h index c8cdce49a7..e3f3f96d00 100644 --- a/indra/newview/llfloaterfriends.h +++ b/indra/newview/llfloaterfriends.h @@ -119,7 +119,8 @@ private: // callback methods static void onSelectName(LLUICtrl* ctrl, void* user_data); - static void callbackAddFriend(S32 option, const std::string& text, void* user_data); + static void callbackAddFriendWithMessage(S32 option, const std::string& text, void* user_data); + static void callbackAddFriend(S32 option, void* user_data); static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data); static void onMaximumSelect(void* user_data); |