From f26f7e3e29019abf3a10f6925e30baca19eb4e2d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 8 Jul 2009 05:19:19 +0000 Subject: merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0 Also: * Moved media remote shortcut to Communicate menu * Changed mini map menu to toggle instead of show --- indra/newview/llpanelavatar.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpanelavatar.cpp') diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 5c572b8fcd..e3c4167d73 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -43,7 +43,6 @@ #include "lltexteditor.h" #include "lltexturectrl.h" #include "lltooldraganddrop.h" -#include "llviewermenu.h" // *FIX: for is_agent_friend() #include "llscrollcontainer.h" #include "llweb.h" @@ -140,7 +139,6 @@ LLPanelProfileTab::LLPanelProfileTab(const Params& params ) LLPanelProfileTab::~LLPanelProfileTab() { - // *TODO Vadim: use notNull() instead. (there are several similar cases below) if(mAvatarId.notNull()) { LLAvatarPropertiesProcessor::getInstance()->removeObserver(getAvatarId(),this); @@ -166,6 +164,11 @@ void LLPanelProfileTab::setProfileType() mProfileType = (gAgentID == mAvatarId) ? PT_OWN : PT_OTHER; } +void LLPanelProfileTab::onOpen(const LLSD& key) +{ + onActivate(key); +} + void LLPanelProfileTab::onActivate(const LLUUID& id) { setAvatarId(id); @@ -293,7 +296,7 @@ void LLPanelAvatarProfile::processProperties(void* data, EAvatarProcessorType ty bool online = avatar_data->flags & AVATAR_ONLINE; - if(is_agent_friend(avatar_data->avatar_id)) + if(LLFriendActions::isFriend(avatar_data->avatar_id)) { // Online status NO could be because they are hidden // If they are a friend, we may know the truth! @@ -533,7 +536,7 @@ void LLPanelAvatarProfile::updateChildrenList() childSetVisible("partner_edit_link", false); //hide for friends - childSetEnabled("add_friend", !is_agent_friend(getAvatarId())); + childSetEnabled("add_friend", !LLFriendActions::isFriend(getAvatarId())); //need to update profile view on every activate mUpdated = false; @@ -727,5 +730,5 @@ void LLPanelAvatarNotes::onActivate(const LLUUID& id) void LLPanelAvatarNotes::updateChildrenList() { //hide for friends - childSetEnabled("add_friend", !is_agent_friend(getAvatarId())); + childSetEnabled("add_friend", !LLFriendActions::isFriend(getAvatarId())); } -- cgit v1.3