From 73a97010e6c8c7874fdc1778ab46e492f77d9394 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 21 Jul 2009 00:57:23 +0000 Subject: 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 --- indra/newview/llpanelpeople.cpp | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'indra/newview/llpanelpeople.cpp') diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 82c8f97d4d..d2879a675f 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -47,7 +47,7 @@ #include "llcallingcard.h" // for LLAvatarTracker #include "llfloateravatarpicker.h" #include "llfloaterminiinspector.h" -#include "llfriendactions.h" +#include "llavataractions.h" #include "llgroupactions.h" #include "llgrouplist.h" #include "llrecentpeople.h" @@ -508,17 +508,19 @@ void LLPanelPeople::updateButtons() if (group_tab_active) { + bool item_selected = mGroupList->getFirstSelected() != NULL; bool cur_group_active = true; - selected_id = mGroupList->getCurrentID(); - if (selected_id.notNull()) + if (item_selected) + { + selected_id = mGroupList->getCurrentID(); cur_group_active = (gAgent.getGroupID() == selected_id); - - bool item_selected = selected_id.notNull(); + } + LLPanel* groups_panel = mTabContainer->getCurrentPanel(); - groups_panel->childSetEnabled("activate_btn", !item_selected || !cur_group_active); // "none" or a non-active group selected + groups_panel->childSetEnabled("activate_btn", item_selected && !cur_group_active); // "none" or a non-active group selected groups_panel->childSetEnabled("plus_btn", item_selected); - groups_panel->childSetEnabled("minus_btn", item_selected); + groups_panel->childSetEnabled("minus_btn", item_selected && selected_id.notNull()); } else { @@ -623,6 +625,8 @@ void LLPanelPeople::onSearchEdit(const std::string& search_string) filterFriendList(); filterRecentList(); updateGroupList(); + + updateButtons(); } void LLPanelPeople::onTabSelected(const LLSD& param) @@ -653,7 +657,7 @@ void LLPanelPeople::onAvatarListCommitted(LLAvatarList* list) void LLPanelPeople::onViewProfileButtonClicked() { LLUUID id = getCurrentItemID(); - LLFriendActions::showProfile(id); + LLAvatarActions::showProfile(id); } void LLPanelPeople::onAddFriendButtonClicked() @@ -663,7 +667,7 @@ void LLPanelPeople::onAddFriendButtonClicked() { std::string name; gCacheName->getFullName(id, name); - LLFriendActions::requestFriendshipDialog(id, name); + LLAvatarActions::requestFriendshipDialog(id, name); } } @@ -680,7 +684,7 @@ void LLPanelPeople::onAddFriendWizButtonClicked() void LLPanelPeople::onDeleteFriendButtonClicked() { - LLFriendActions::removeFriendDialog(getCurrentItemID()); + LLAvatarActions::removeFriendDialog(getCurrentItemID()); } void LLPanelPeople::onGroupInfoButtonClicked() @@ -702,7 +706,7 @@ void LLPanelPeople::onImButtonClicked() LLUUID id = getCurrentItemID(); if (id.notNull()) { - LLFriendActions::startIM(id); + LLAvatarActions::startIM(id); } } @@ -718,7 +722,7 @@ void LLPanelPeople::onAvatarPicked( void*) { if (!names.empty() && !ids.empty()) - LLFriendActions::requestFriendshipDialog(ids[0], names[0]); + LLAvatarActions::requestFriendshipDialog(ids[0], names[0]); } bool LLPanelPeople::onFriendListUpdate(U32 changed_mask) @@ -765,7 +769,7 @@ void LLPanelPeople::onCallButtonClicked() void LLPanelPeople::onTeleportButtonClicked() { - LLFriendActions::offerTeleport(getCurrentItemID()); + LLAvatarActions::offerTeleport(getCurrentItemID()); } void LLPanelPeople::onShareButtonClicked() -- cgit v1.2.3