diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llfloaterfriends.cpp | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llfloaterfriends.cpp')
| -rw-r--r-- | indra/newview/llfloaterfriends.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp index 1e8129c7d3..1e8e7bad74 100644 --- a/indra/newview/llfloaterfriends.cpp +++ b/indra/newview/llfloaterfriends.cpp @@ -46,7 +46,7 @@ #include "llfloateravatarpicker.h" #include "llviewerwindow.h" #include "llbutton.h" -#include "llfriendactions.h" +#include "llavataractions.h" #include "llinventorymodel.h" #include "llnamelistctrl.h" #include "llnotify.h" @@ -62,7 +62,7 @@ #include "lltextbox.h" #include "llvoiceclient.h" -// *TODO: Move more common stuff to LLFriendActions? +// *TODO: Move more common stuff to LLAvatarActions? //Maximum number of people you can select to do an operation on at once. #define MAX_FRIEND_SELECT 20 @@ -546,7 +546,7 @@ void LLPanelFriends::onClickProfile(void* user_data) if(ids.size() > 0) { LLUUID agent_id = ids[0]; - LLFriendActions::showProfile(agent_id); + LLAvatarActions::showProfile(agent_id); } } @@ -560,11 +560,11 @@ void LLPanelFriends::onClickIM(void* user_data) { if(ids.size() == 1) { - LLFriendActions::startIM(ids[0]); + LLAvatarActions::startIM(ids[0]); } else { - LLFriendActions::startConference(ids); + LLAvatarActions::startConference(ids); } } } @@ -576,7 +576,7 @@ void LLPanelFriends::onPickAvatar(const std::vector<std::string>& names, { if (names.empty()) return; if (ids.empty()) return; - LLFriendActions::requestFriendshipDialog(ids[0], names[0]); + LLAvatarActions::requestFriendshipDialog(ids[0], names[0]); } // static @@ -595,14 +595,14 @@ void LLPanelFriends::onClickAddFriend(void* user_data) void LLPanelFriends::onClickRemove(void* user_data) { LLPanelFriends* panelp = (LLPanelFriends*)user_data; - LLFriendActions::removeFriendsDialog(panelp->getSelectedIDs()); + LLAvatarActions::removeFriendsDialog(panelp->getSelectedIDs()); } // static void LLPanelFriends::onClickOfferTeleport(void* user_data) { LLPanelFriends* panelp = (LLPanelFriends*)user_data; - LLFriendActions::offerTeleport(panelp->getSelectedIDs()); + LLAvatarActions::offerTeleport(panelp->getSelectedIDs()); } // static |