diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
| commit | b9b4a4d9347053a3834ca2928063136948f09d1d (patch) | |
| tree | c2affaf017c2967989ff0b4a2b125d348736a04a /indra/newview/llfloaterfriends.h | |
| parent | 0a3b9e8e141a6f38ecbdf6020312e7a89b153bc4 (diff) | |
QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloaterfriends.h')
| -rw-r--r-- | indra/newview/llfloaterfriends.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h index d934faa616..c8cdce49a7 100644 --- a/indra/newview/llfloaterfriends.h +++ b/indra/newview/llfloaterfriends.h @@ -80,7 +80,7 @@ public: // Just request friendship, no dialog. static void requestFriendship(const LLUUID& target_id, - const std::string& target_name); + const std::string& target_name, const std::string& message); private: @@ -119,7 +119,7 @@ private: // callback methods static void onSelectName(LLUICtrl* ctrl, void* user_data); - static void callbackAddFriend(S32 option, void* user_data); + static void callbackAddFriend(S32 option, const std::string& text, 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); |