diff options
| author | Cho <cho@lindenlab.com> | 2013-03-09 01:05:01 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-03-09 01:05:01 +0000 |
| commit | 57469ce55def897699364bc03580b077af91cca1 (patch) | |
| tree | 86c3997e7d0ccfeb3bc58c548d67a40a0f2780d0 /indra | |
| parent | 6cd617a60dfb4cd491da495a4e4f5c0285f95a95 (diff) | |
ACME-97 FIX Create an extra FB tab in the People panel
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_people.xml | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index f1380e7a36..903574e8bd 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -72,6 +72,7 @@ static const std::string NEARBY_TAB_NAME = "nearby_panel"; static const std::string FRIENDS_TAB_NAME = "friends_panel"; static const std::string GROUP_TAB_NAME = "groups_panel"; static const std::string RECENT_TAB_NAME = "recent_panel"; +static const std::string FBCTEST_TAB_NAME = "fbctest_panel"; static const std::string COLLAPSED_BY_USER = "collapsed_by_user"; @@ -943,6 +944,9 @@ LLUUID LLPanelPeople::getCurrentItemID() const if (cur_tab == GROUP_TAB_NAME) return mGroupList->getSelectedUUID(); + if (cur_tab == FBCTEST_TAB_NAME) + return LLUUID::null; + llassert(0 && "unknown tab selected"); return LLUUID::null; } @@ -963,6 +967,8 @@ void LLPanelPeople::getCurrentItemIDs(uuid_vec_t& selected_uuids) const mRecentList->getSelectedUUIDs(selected_uuids); else if (cur_tab == GROUP_TAB_NAME) mGroupList->getSelectedUUIDs(selected_uuids); + else if (cur_tab == FBCTEST_TAB_NAME) + return; else llassert(0 && "unknown tab selected"); diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 98c7c49ff4..5c698c5048 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -571,6 +571,21 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M /> </panel> </panel> + <panel + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + follows="all" + height="383" + label="FBC TEST" + layout="topleft" + left="0" + help_topic="people_fbctest_tab" + name="fbctest_panel" + top="0" + width="313"> + </panel> </tab_container> <panel follows="bottom|left|right" |