diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
| commit | 0277259455c4354f81ea8a24c8ab93f27567bc6f (patch) | |
| tree | f1411dab563dcf697f794e9e8a592a6d3e5c4d2d /indra/newview/llfloaterfriends.h | |
| parent | 568397bbcc4fca307ebc010ec7f815422b9ba80a (diff) | |
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llfloaterfriends.h')
| -rw-r--r-- | indra/newview/llfloaterfriends.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h index a71b53f206..c6ef365517 100644 --- a/indra/newview/llfloaterfriends.h +++ b/indra/newview/llfloaterfriends.h @@ -53,7 +53,14 @@ public: // Toggles visibility of floater static void toggle(void* unused = NULL); - static void requestFriendship(const LLUUID& target_id, const LLString& target_name); + // Show a dialog explaining what friendship entails, then request + // friendship. JC + static void requestFriendshipDialog(const LLUUID& target_id, + const std::string& target_name); + + // Just request friendship, no dialog. + static void requestFriendship(const LLUUID& target_id, + const LLString& target_name); private: |