diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
| commit | 21bfcbde7ec6e6b3e8a92237b7c33879216c4e82 (patch) | |
| tree | 5346bb05d7f74d2f2021883ff0ee4f32bbb56f4a /indra/newview/llpanelpeople.cpp | |
| parent | 2da8eb43d57ae6876f9955386f604f2c56849211 (diff) | |
| parent | aff85ed92c5aad3a9445cf4ec5447cc56c44dfc0 (diff) | |
Merge changes
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 9be2fb12d2..a8e3fd3195 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -638,6 +638,11 @@ void LLPanelPeople::onTabSelected(const LLSD& param) std::string tab_name = getChild<LLPanel>(param.asString())->getName(); mNearbyListUpdater->setActive(tab_name == NEARBY_TAB_NAME); updateButtons(); + + if (GROUP_TAB_NAME == tab_name) + mFilterEditor->setLabel(getString("groups_filter_label")); + else + mFilterEditor->setLabel(getString("people_filter_label")); } void LLPanelPeople::onAvatarListDoubleClicked(LLAvatarList* list) @@ -669,9 +674,7 @@ void LLPanelPeople::onAddFriendButtonClicked() LLUUID id = getCurrentItemID(); if (id.notNull()) { - std::string name; - gCacheName->getFullName(id, name); - LLAvatarActions::requestFriendshipDialog(id, name); + LLAvatarActions::requestFriendshipDialog(id); } } @@ -693,9 +696,7 @@ void LLPanelPeople::onDeleteFriendButtonClicked() void LLPanelPeople::onGroupInfoButtonClicked() { - LLUUID group_id = getCurrentItemID(); - if (group_id.notNull()) - LLGroupActions::info(group_id); + LLGroupActions::show(getCurrentItemID()); } void LLPanelPeople::onChatButtonClicked() @@ -763,7 +764,7 @@ void LLPanelPeople::onGroupPlusMenuItemClicked(const LLSD& userdata) if (chosen_item == "join_group") LLGroupActions::search(); else if (chosen_item == "new_group") - LLGroupActions::create(); + LLGroupActions::createGroup(); } void LLPanelPeople::onCallButtonClicked() @@ -798,6 +799,9 @@ void LLPanelPeople::onMoreButtonClicked() void LLPanelPeople::onOpen(const LLSD& key) { std::string tab_name = key["people_panel_tab_name"]; + mFilterEditor -> clear(); + onFilterEdit(""); + if (!tab_name.empty()) mTabContainer->selectTabByName(tab_name); else |