diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:57:23 +0000 |
| commit | 73a97010e6c8c7874fdc1778ab46e492f77d9394 (patch) | |
| tree | f0c8efb1cebcc6157c8e6678cf0eb39b5792a1d7 /indra/newview/llpanelavatar.cpp | |
| parent | dedb5be906b53d1ea8601ff6b9c4b726fda02da8 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index e3c4167d73..868d4d9200 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -38,7 +38,7 @@ #include "llavatarconstants.h" #include "llcallingcard.h" #include "llcombobox.h" -#include "llfriendactions.h" +#include "llavataractions.h" #include "llimview.h" #include "lltexteditor.h" #include "lltexturectrl.h" @@ -182,7 +182,7 @@ void LLPanelProfileTab::onAddFriend() { std::string name; gCacheName->getFullName(getAvatarId(),name); - LLFriendActions::requestFriendshipDialog(getAvatarId(), name); + LLAvatarActions::requestFriendshipDialog(getAvatarId(), name); } } @@ -200,7 +200,7 @@ void LLPanelProfileTab::onTeleport() { if(getAvatarId().notNull()) { - LLFriendActions::offerTeleport(getAvatarId()); + LLAvatarActions::offerTeleport(getAvatarId()); } } @@ -296,7 +296,7 @@ void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType ty bool online = avatar_data->flags & AVATAR_ONLINE; - if(LLFriendActions::isFriend(avatar_data->avatar_id)) + if(LLAvatarActions::isFriend(avatar_data->avatar_id)) { // Online status NO could be because they are hidden // If they are a friend, we may know the truth! @@ -536,7 +536,7 @@ void LLPanelAvatarProfile::updateChildrenList() childSetVisible("partner_edit_link", false); //hide for friends - childSetEnabled("add_friend", !LLFriendActions::isFriend(getAvatarId())); + childSetEnabled("add_friend", !LLAvatarActions::isFriend(getAvatarId())); //need to update profile view on every activate mUpdated = false; @@ -730,5 +730,5 @@ void LLPanelAvatarNotes::onActivate(const LLUUID& id) void LLPanelAvatarNotes::updateChildrenList() { //hide for friends - childSetEnabled("add_friend", !LLFriendActions::isFriend(getAvatarId())); + childSetEnabled("add_friend", !LLAvatarActions::isFriend(getAvatarId())); } |