From 4f526f12e6332307c8d3105e5a4f6e35f2dbd3d7 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 6 Apr 2012 19:29:53 +0300
Subject: CHUI-77 WIP Moved setting filter label to XML.
---
indra/newview/llpanelpeople.cpp | 5 -----
indra/newview/skins/default/xui/en/panel_people.xml | 14 ++++----------
2 files changed, 4 insertions(+), 15 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 238834aa92..2d665e9bf3 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1016,11 +1016,6 @@ void LLPanelPeople::onTabSelected(const LLSD& param)
updateButtons();
showFriendsAccordionsIfNeeded();
-
- if (GROUP_TAB_NAME == tab_name)
- mFilterEditor->setLabel(getString("groups_filter_label"));
- else
- mFilterEditor->setLabel(getString("people_filter_label"));
}
void LLPanelPeople::onAvatarListDoubleClicked(LLUICtrl* ctrl)
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index f61b0b3dbd..5da87456f1 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -38,12 +38,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
name="no_filtered_friends_msg">
Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
</string>
- <string
- name="people_filter_label"
- value="Filter People" />
- <string
- name="groups_filter_label"
- value="Filter Groups" />
<!--
*WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes.
They are not defined as translatable in VLT. See EXT-5931
@@ -104,7 +98,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
height="23"
layout="topleft"
left="3"
- label="Filter"
+ label="Filter People"
max_length_chars="300"
name="nearby_filter_input"
text_color="Black"
@@ -253,7 +247,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
height="23"
layout="topleft"
left="3"
- label="Filter"
+ label="Filter People"
max_length_chars="300"
name="friends_filter_input"
text_color="Black"
@@ -410,7 +404,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
height="23"
layout="topleft"
left="3"
- label="Filter"
+ label="Filter Groups"
max_length_chars="300"
name="groups_filter_input"
text_color="Black"
@@ -533,7 +527,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
height="23"
layout="topleft"
left="3"
- label="Filter"
+ label="Filter People"
max_length_chars="300"
name="recent_filter_input"
text_color="Black"
--
cgit v1.2.3