diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-13 05:32:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-13 05:32:26 +0000 |
| commit | 2ac24047df0fd967ef67564e8d7bfe94dcf11554 (patch) | |
| tree | 0d26f3bf178b84f99e540e28e239f321744d1f01 /indra | |
| parent | faafa7405f2fe70996c1554605b55679c28fd10b (diff) | |
Skinning merge fix plus missed files.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_land_money.xml | 22 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_roles.xml | 124 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_people.xml | 963 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile.xml | 670 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_side_tray.xml | 604 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml | 314 |
7 files changed, 1069 insertions, 1631 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index d34ca88fc6..f9de409596 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -37,7 +37,6 @@ #include "llavataractions.h" #include "llavatariconctrl.h" #include "llbutton.h" -#include "llfloatergroupinfo.h" LLPanelIMControlPanel::LLPanelIMControlPanel() { @@ -96,7 +95,7 @@ BOOL LLPanelGroupControlPanel::postBuild() void LLPanelGroupControlPanel::onGroupInfoButtonClicked() { - LLFloaterGroupInfo::showFromUUID(mGroupID); + //LLFloaterGroupInfo::showFromUUID(mGroupID); } diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index c52994b43d..57ca8747e5 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -2,12 +2,12 @@ <panel border="true" follows="all" - height="420" + height="490" label="Land & L$" layout="topleft" left="1" name="land_money_tab" - top="470" + top="490" width="280"> <panel.string name="help_text"> @@ -40,7 +40,7 @@ top="8" width="20" /> --> - <text + <!-- <text type="string" length="1" follows="left|top" @@ -52,7 +52,7 @@ top_pad="10" width="260"> Group Owned Land - </text> + </text> --> <scroll_list draw_heading="true" follows="top" @@ -62,7 +62,7 @@ layout="topleft" left_delta="0" name="group_parcel_list" - top_pad="4" + top_pad="10" width="265"> <scroll_list.columns label="Parcel" @@ -213,9 +213,9 @@ halign="right" height="16" layout="topleft" - left_pad="5" + left="140" name="your_contribution_max_value" - top_delta="0" + top_pad="0" width="95"> ([AMOUNT] max) </text> @@ -274,7 +274,7 @@ left="1" name="group_money_planning_tab" top="5" - width="270"> + width="265"> <text_editor type="string" length="1" @@ -300,7 +300,7 @@ left_delta="0" name="group_money_details_tab" top_delta="0" - width="270"> + width="265"> <text_editor type="string" length="1" @@ -346,7 +346,7 @@ left_delta="0" name="group_money_sales_tab" top_delta="-1" - width="270"> + width="265"> <text_editor type="string" length="1" @@ -384,4 +384,4 @@ width="125" /> </panel> </tab_container> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 132c06d028..c1d7393839 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel border="true" - height="380" + height="490" label="Members & Roles" layout="topleft" left="1" name="roles_tab" + top="490" width="280"> <panel.string name="default_needs_apply_text"> @@ -28,7 +29,7 @@ top="8" width="20" /> --> - <panel + <!--<panel follows="left|top" height="80" layout="topleft" @@ -44,7 +45,7 @@ layout="topleft" left="0" name="static" - top="4" + top="0" width="270"> Members & Roles </text> @@ -78,7 +79,7 @@ layout="topleft" left="0" name="static" - top="4" + top="0" width="270"> Roles </text> @@ -139,7 +140,7 @@ layout="topleft" left_delta="0" name="actions_header" - top_delta="20" + top_delta="0" visible="false" width="270"> <text @@ -150,7 +151,7 @@ layout="topleft" left="0" name="static" - top="-16" + top="0" width="270"> Abilities </text> @@ -166,14 +167,15 @@ width="270"> You can view an Ability's Description and which Roles and Members can execute the Ability. </text> - </panel> + </panel> --> <tab_container + follows="left|top" height="180" layout="topleft" - left_delta="0" + left="5" name="roles_tab_container" tab_position="top" - top="80" + top="10" width="265"> <panel border="true" @@ -183,7 +185,7 @@ left="1" name="members_sub_tab" tool_tip="Members" - top="16" + top="17" class="panel_group_members_subtab" width="265"> <panel.string @@ -192,7 +194,26 @@ Select multiple Members by holding the Ctrl key and clicking on their names. </panel.string> - <line_editor + <search_editor + layout="topleft" + top="10" + left="4" + width="255" + height="20" + follows="left|top|right" + max_length="250" + label="Filter Roles" + name="filter_input" + font="SansSerif" + background_image="TextField_Search_Off" + text_pad_left="10" + text_color="black"> + <search_button label="" + top_pad="4" + left_pad="6" + /> + </search_editor> + <!--<line_editor border_style="line" border_thickness="1" follows="left|top" @@ -221,17 +242,18 @@ clicking on their names. left_pad="0" name="show_all_button" top_delta="0" - width="80" /> + width="80" /> --> <name_list column_padding="0" draw_heading="true" heading_height="14" height="100" + follows="left|top" layout="topleft" left="4" multi_select="true" name="member_list" - top_pad="4" + top_pad="6" width="255"> <name_list.columns label="Member" @@ -280,7 +302,7 @@ clicking on their names. left_delta="0" name="roles_sub_tab" class="panel_group_roles_subtab" - top_delta="0" + top="17" width="265"> <panel.string name="help_text"> @@ -305,7 +327,26 @@ including the Everyone and Owner Roles. name="power_partial_icon"> checkbox_enabled_false.tga </panel.string> - <line_editor + <search_editor + layout="topleft" + top="10" + left="4" + width="255" + height="20" + follows="left|top|right" + max_length="250" + label="Filter People" + name="filter_input" + font="SansSerif" + background_image="TextField_Search_Off" + text_pad_left="10" + text_color="black"> + <search_button label="" + top_pad="4" + left_pad="6" + /> + </search_editor> + <!--<line_editor border_style="line" border_thickness="1" follows="left|top" @@ -334,7 +375,7 @@ including the Everyone and Owner Roles. left_pad="0" name="show_all_button" top_delta="0" - width="80" /> + width="80" /> --> <scroll_list column_padding="0" draw_heading="true" @@ -362,7 +403,7 @@ including the Everyone and Owner Roles. <button height="20" font="SansSerifSmall" - label="Create New Role" + label="Add Role" layout="topleft" left_delta="0" name="role_create" @@ -386,14 +427,34 @@ including the Everyone and Owner Roles. left_delta="0" name="actions_sub_tab" class="panel_group_actions_subtab" - top_delta="0" + top="17" + tool_tip="You can view an Ability's Description and which Roles and Members can execute the Ability." width="265"> <panel.string name="help_text"> Abilities allow Members in Roles to do specific things in this group. There's a broad variety of Abilities. </panel.string> - <line_editor + <search_editor + layout="topleft" + top="10" + left="4" + width="255" + height="20" + follows="left|top|right" + max_length="250" + label="Filter Abilities" + name="filter_input" + font="SansSerif" + background_image="TextField_Search_Off" + text_pad_left="10" + text_color="black"> + <search_button label="" + top_pad="4" + left_pad="6" + /> + </search_editor> + <!--<line_editor border_style="line" border_thickness="1" follows="left|top" @@ -422,7 +483,7 @@ things in this group. There's a broad variety of Abilities. left_pad="0" name="show_all_button" top_delta="0" - width="80" /> + width="80" /> --> <scroll_list column_padding="0" draw_stripes="false" @@ -457,6 +518,7 @@ things in this group. There's a broad variety of Abilities. <panel height="50" layout="topleft" + follows="left|top" left="10" name="members_footer" top_pad="10" @@ -467,6 +529,7 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" + follows="left|top" left="0" name="static" top_pad="0" @@ -479,6 +542,7 @@ things in this group. There's a broad variety of Abilities. font="SansSerif" height="16" layout="topleft" + follows="left|top" left_pad="35" name="static2" top_delta="0" @@ -488,7 +552,8 @@ things in this group. There's a broad variety of Abilities. <scroll_list draw_stripes="false" enabled="false" - height="75" + follows="left|top" + height="150" layout="topleft" left="0" name="member_assigned_roles" @@ -506,8 +571,9 @@ things in this group. There's a broad variety of Abilities. <scroll_list draw_stripes="false" enabled="false" - height="75" + height="150" layout="topleft" + follows="left|top" left_pad="5" name="member_allowed_actions" tool_tip="For Details of each Allowed Ability see the Abilities tab." @@ -561,7 +627,7 @@ things in this group. There's a broad variety of Abilities. border_style="line" border_thickness="1" follows="left|top" - height="16" + height="20" layout="topleft" left="0" max_length="20" @@ -588,7 +654,7 @@ things in this group. There's a broad variety of Abilities. border_style="line" border_thickness="1" follows="left|top" - height="16" + height="20" layout="topleft" left_delta="0" max_length="20" @@ -640,7 +706,7 @@ things in this group. There's a broad variety of Abilities. <name_list draw_stripes="false" enabled="false" - height="75" + height="150" layout="topleft" left="0" name="role_assigned_members" @@ -657,7 +723,7 @@ things in this group. There's a broad variety of Abilities. width="130" /> <scroll_list draw_stripes="false" - height="75" + height="150" layout="topleft" left="135" name="role_allowed_actions" @@ -741,7 +807,7 @@ things in this group. There's a broad variety of Abilities. </text> <scroll_list enabled="false" - height="75" + height="150" layout="topleft" left="0" name="action_roles" @@ -749,11 +815,11 @@ things in this group. There's a broad variety of Abilities. width="130" /> <name_list enabled="false" - height="75" + height="150" layout="topleft" left_pad="5" name="action_members" top_delta="0" width="130" /> </panel> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index bccc04e30c..b934312971 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,498 +1,481 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - layout="topleft" - font="SansSerifBigBold" - top="0" - left="0" - width="305" - height="465" - follows="left|top|right|bottom" - background_visible="true" - bg_alpha_color="DkGray2" - bevel_style="in" - label="People" - name="people_panel"> - <filter_editor - layout="topleft" - top="3" - left="10" - width="256" - height="23" - follows="left|top|right" - max_length="270" - name="filter_input" - font="SansSerif" - background_image="TextField_Search_Off" - text_pad_left="23" - text_color="black" /> - <button - name="people_search" - layout="topleft" - top="5" - left="23" - width="13" - height="13" - scale_image="false" - follows="left|top|right" - font="SansSerifBigBold" - image_selected="Search" - image_unselected="Search" - picture_style="true"/> - <tab_container - layout="topleft" - top="30" - left="10" - width="295" - height="400" - follows="left|top|right|bottom" - name="tabs" - tab_position="top"> - <panel - layout="topleft" - height="390" - width="280" - follows="left|top|right|bottom" - background_visible="false" - bevel_style="none" - label="Nearby" - name="nearby_panel"> - <avatar_list - layout="topleft" - top="2" - left="0" - width="280" - height="357" - follows="left|top|right|bottom" - name="avatar_list" - volume_column_width="20"/> - <panel - layout="topleft" - bottom="390" - left="0" - width="280" - height="30" - follows="left|right|bottom" - background_visible="true" - bevel_style="none" - label="bottom_panel" - name="bottom_panel"> - <button - name="gear_btn" - enabled="false" - layout="topleft" - top="7" - left="20" - width="18" - height="18" - follows="bottom|right" - font="SansSerifBigBold" - hover_glow_amount="0.15" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - picture_style="true"/> + background_visible="true" + follows="all" + height="400" + label="People" + layout="topleft" + min_height="350" + min_width="240" + name="people_panel" + width="305"> + <string + name="no_people" + value="No people" /> + <string + name="no_one_near" + value="No-one near" /> + <string + name="no_friends" + value="No friends" /> + <string + name="no_groups" + value="No groups" /> + <filter_editor + background_image="TextField_Search_Off" + follows="left|top|right" + font="SansSerif" + height="23" + layout="topleft" + left="15" + max_length="270" + name="filter_input" + text_color="black" + text_pad_left="26" + top="3" + width="256" /> + <button + follows="left|top|right" + height="13" + image_selected="Search" + image_unselected="Search" + layout="topleft" + left="20" + name="people_search" + picture_style="true" + scale_image="false" + top="8" + width="13" /> + <tab_container + follows="left|top|right|bottom" + height="326" + layout="topleft" + left="9" + name="tabs" + tab_position="top" + top_pad="15" + width="285"> + <panel + bevel_style="none" + follows="left|top|right|bottom" + height="390" + label="Nearby" + layout="topleft" + name="nearby_panel" + width="285"> + <avatar_list + follows="left|top|right|bottom" + height="357" + layout="topleft" + left="0" + name="avatar_list" + top="2" + volume_column_width="20" + width="285" /> + <panel + background_visible="true" + bevel_style="none" + bottom="390" + follows="left|right|bottom" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + width="285"> + <button + enabled="false" + follows="bottom|right" + font="SansSerifBigBold" + height="18" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="20" + name="gear_btn" + picture_style="true" + top="7" + width="18" /> + </panel> </panel> - </panel> - <panel - layout="topleft" - height="390" - width="280" - follows="left|top|right|bottom" - background_visible="true" - bevel_style="none" - label="Friends" - name="friends_panel"> - <avatar_list - layout="topleft" - top="2" - left="0" - width="280" - height="357" - follows="left|top|right|bottom" - name="avatar_list"/> - <panel - layout="topleft" - bottom="390" - left="0" - width="280" - height="30" - follows="left|right|bottom" - background_visible="true" - bevel_style="none" - label="bottom_panel" - name="bottom_panel"> - <button - name="gear_btn" - enabled="false" - layout="topleft" - top="7" - left="20" - width="18" - height="18" - follows="bottom|right" - font="SansSerifBigBold" - hover_glow_amount="0.15" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - picture_style="true"/> - <button - name="add_btn" - layout="topleft" - top_delta="0" - left_pad="5" - width="18" - height="18" - follows="bottom|left" - font="SansSerifBigBold" - hover_glow_amount="0.15" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - picture_style="true"/> - <button - name="del_btn" - layout="topleft" - top_delta="0" - left_pad="180" - width="18" - height="18" - follows="bottom|left" - font="SansSerifBigBold" - hover_glow_amount="0.15" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - picture_style="true"/> + <panel + background_visible="true" + bevel_style="none" + follows="left|top|right|bottom" + height="390" + label="Friends" + layout="topleft" + name="friends_panel" + width="285"> + <avatar_list + follows="left|top|right|bottom" + height="357" + layout="topleft" + left="0" + name="avatar_list" + top="2" + width="285" /> + <panel + background_visible="true" + bevel_style="none" + bottom="390" + follows="left|right|bottom" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + width="285"> + <button + enabled="false" + follows="bottom|right" + font="SansSerifBigBold" + height="18" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="20" + name="gear_btn" + picture_style="true" + top="7" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + layout="topleft" + left_pad="5" + name="add_btn" + picture_style="true" + top_delta="0" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + left_pad="180" + name="del_btn" + picture_style="true" + top_delta="0" + width="18" /> + </panel> </panel> - </panel> - <panel - layout="topleft" - height="390" - width="280" - follows="left|top|right|bottom" - background_visible="true" - bevel_style="none" - label="Groups" - name="groups_panel"> - <group_list - layout="topleft" - top="2" - left="0" - width="280" - height="357" - follows="left|top|right|bottom" - name="group_list"/> - <panel - layout="topleft" - bottom="390" - left="0" - width="280" - height="30" - follows="left|right|bottom" - background_visible="true" - bevel_style="none" - label="bottom_panel" - name="bottom_panel"> - <button - name="gear_btn" - enabled="false" - layout="topleft" - top="7" - left="20" - width="18" - height="18" - follows="bottom|right" - font="SansSerifBigBold" - hover_glow_amount="0.15" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - picture_style="true"/> - <button - name="plus_btn" - layout="topleft" - top_delta="0" - left_pad="5" - width="18" - height="18" - follows="bottom|left" - font="SansSerifBigBold" - hover_glow_amount="0.15" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - picture_style="true"/> - <button - name="activate_btn" - layout="topleft" - top_delta="5" - left_pad="24" - width="10" - height="10" - follows="bottom|left" - font="SansSerifBigBold" - image_hover_selected="group_activate_btn.tga" - image_selected="group_activate_btn.tga" - image_unselected="group_activate_btn.tga" - picture_style="true"/> - <button - name="minus_btn" - layout="topleft" - top_delta="-5" - left_pad="146" - width="18" - height="18" - follows="bottom|left" - font="SansSerifBigBold" - hover_glow_amount="0.15" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - picture_style="true"/> + <panel + background_visible="true" + bevel_style="none" + follows="left|top|right|bottom" + height="390" + label="Groups" + layout="topleft" + name="groups_panel" + width="285"> + <group_list + follows="left|top|right|bottom" + height="357" + layout="topleft" + left="0" + name="group_list" + top="2" + width="285" /> + <panel + background_visible="true" + bevel_style="none" + bottom="390" + follows="left|right|bottom" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + width="285"> + <button + enabled="false" + follows="bottom|right" + font="SansSerifBigBold" + height="18" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="20" + name="gear_btn" + picture_style="true" + top="7" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + layout="topleft" + left_pad="5" + name="plus_btn" + picture_style="true" + top_delta="0" + width="18" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="10" + image_hover_selected="group_activate_btn.tga" + image_selected="group_activate_btn.tga" + image_unselected="group_activate_btn.tga" + layout="topleft" + left_pad="24" + name="activate_btn" + picture_style="true" + top_delta="5" + width="10" /> + <button + follows="bottom|left" + font="SansSerifBigBold" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + left_pad="146" + name="minus_btn" + picture_style="true" + top_delta="-5" + width="18" /> + </panel> </panel> - </panel> - <panel - layout="topleft" - height="390" - width="280" - follows="left|top|right|bottom" - background_visible="true" - bevel_style="none" - label="History" - name="recent_panel"> - <avatar_list - layout="topleft" - top="2" - left="0" - width="280" - height="357" - follows="left|top|right|bottom" - name="avatar_list"/> - <panel - layout="topleft" - bottom="390" - left="0" - width="280" - height="30" - follows="left|right|bottom" - background_visible="true" - bevel_style="none" - label="bottom_panel" - name="bottom_panel"> - <button - name="gear_btn" - enabled="false" - layout="topleft" - top="7" - left="20" - width="18" - height="18" - follows="bottom|right" - font="SansSerifBigBold" - hover_glow_amount="0.15" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - picture_style="true"/> - </panel> - </panel> - </tab_container> - <layout_stack - name="button_bar" - follows="left|right|bottom" - bottom="6" - left="6" - width="295" - height="27" - orientation="horizontal" - animate="false" - border_size="0"> - <layout_panel - name="view_profile_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="85" - width="85" - visible="true"> - <button - label="View Profile" - name="view_profile_btn" - layout="topleft" - width="85" - height="25" - follows="top|left|right" - font="SansSerifSmallBold"/> - </layout_panel> - <layout_panel - name="add_friend_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="85" - width="85" - visible="true"> - <button - label="Add Friend" - name="add_friend_btn" - layout="topleft" - width="85" height="25" - follows="top|left|right" - font="SansSerifSmallBold"/> - </layout_panel> - <layout_panel - name="group_info_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="80" - width="80" - visible="true"> - <button - label="Group Info" - name="group_info_btn" - layout="topleft" - width="80" - height="25" - follows="top|left|right" - font="SansSerifSmallBold"/> - </layout_panel> - <layout_panel name="chat_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="45" - width="45" - visible="true"> - <button - label="Chat" - name="chat_btn" - layout="topleft" - width="45" height="25" - follows="top|left|right" - font="SansSerifSmallBold"/> - </layout_panel> - <layout_panel - name="im_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="35" - width="35" - visible="true"> - <button - label="IM" - name="im_btn" - layout="topleft" - width="35" - height="25" - follows="top|left|right" - font="SansSerifSmallBold"/> - </layout_panel> - <layout_panel - name="call_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="40" - width="40" - visible="false"> - <button - label="Call" - name="call_btn" - enabled="false" - layout="topleft" - width="40" - height="25" - follows="top|left|right" - font="SansSerifSmallBold"/> - </layout_panel> - <layout_panel - name="teleport_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="65" - width="65"> - <button - label="Teleport" - name="teleport_btn" - width="65" - height="25" - layout="topleft" - follows="left|top|right" - font="SansSerifSmallBold"/> - </layout_panel> - <layout_panel - name="share_btn_panel" - enabled="false" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="50" - width="50" - visible="false"> - <button - label="Share" - name="share_btn" - enabled="false" - layout="topleft" - width="50" - height="25" - follows="top|left|right" - font="SansSerifSmallBold"/> - </layout_panel> - <layout_panel - name="more_btn_panel" - border="false" - bottom="0" - default_tab_group="1" - follows="left|top|right" - height="25" - left="0" - min_width="40" - width="40" - visible="true"> - <button - label=">>" - name="more_btn" - enabled="false" - layout="topleft" - width="40" - height="25" - follows="top|right" - font="SansSerifSmallBold"/> - </layout_panel> - </layout_stack> - <string name="no_people"> - No people - </string> - <string name="no_one_near"> - No-one near - </string> - <string name="no_friends"> - No friends - </string> - <string name="no_groups"> - No groups - </string> + <panel + background_visible="true" + bevel_style="none" + follows="left|top|right|bottom" + height="390" + label="Recent" + layout="topleft" + name="recent_panel" + width="285"> + <avatar_list + follows="left|top|right|bottom" + height="357" + layout="topleft" + left="0" + name="avatar_list" + top="2" + width="285" /> + <panel + background_visible="true" + bevel_style="none" + bottom="390" + follows="left|right|bottom" + height="30" + label="bottom_panel" + layout="topleft" + left="0" + name="bottom_panel" + width="285"> + <button + enabled="false" + follows="bottom|right" + font="SansSerifBigBold" + height="18" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="20" + name="gear_btn" + picture_style="true" + top="7" + width="18" /> + </panel> + </panel> + </tab_container> + <layout_stack + animate="false" + border_size="0" + follows="left|right|bottom" + height="27" + layout="topleft" + left="10" + name="button_bar" + orientation="horizontal" + top_pad="0" + width="295"> + <layout_panel + default_tab_group="1" + follows="left|top|right" + height="25" + layout="topleft" + left="0" + name="view_profile_btn_panel" + top="-25" + width="65"> + <button + follows="top|left|right" + font="SansSerifSmallBold" + height="25" + label="Profile" + layout="topleft" + name="view_profile_btn" + width="65" /> + </layout_panel> +<!-- <layout_panel + default_tab_group="1" + follows="left|top|right" + height="25" + layout="topleft" + left_pad="0" + min_width="85" + name="add_friend_btn_panel" + top_delta="0" + width="85"> + <button + follows="top|left|right" + font="SansSerifSmallBold" + height="25" + label="Add Friend" + layout="topleft" + name="add_friend_btn" + width="85" /> + </layout_panel>--> + <layout_panel + default_tab_group="1" + follows="left|top|right" + height="25" + layout="topleft" + left_pad="0" + min_width="80" + name="group_info_btn_panel" + width="80"> + <button + follows="top|left|right" + font="SansSerifSmallBold" + height="25" + label="Group Profile" + layout="topleft" + name="group_info_btn" + width="80" /> + </layout_panel> + <layout_panel + default_tab_group="1" + follows="left|top|right" + height="25" + layout="topleft" + left_pad="0" + min_width="45" + name="chat_btn_panel" + top_delta="0" + width="45"> + <button + follows="top|left|right" + font="SansSerifSmallBold" + height="25" + label="Chat" + layout="topleft" + name="chat_btn" + width="45" /> + </layout_panel> + <layout_panel + default_tab_group="1" + follows="left|top|right" + height="25" + layout="topleft" + left_pad="0" + min_width="35" + name="im_btn_panel" + top_delta="0" + width="35"> + <button + follows="top|left|right" + font="SansSerifSmallBold" + height="25" + label="IM" + layout="topleft" + name="im_btn" + width="35" /> + </layout_panel> + <layout_panel + default_tab_group="1" + follows="left|top|right" + height="25" + layout="topleft" + left_pad="0" + min_width="40" + name="call_btn_panel" + top_delta="0" + visible="false" + width="40"> + <button + enabled="false" + follows="top|left|right" + font="SansSerifSmallBold" + height="25" + label="Call" + layout="topleft" + name="call_btn" + width="40" /> + </layout_panel> + <layout_panel + default_tab_group="1" + follows="left|top|right" + height="25" + layout="topleft" + left_pad="0" + min_width="65" + name="teleport_btn_panel" + top_delta="0" + width="65"> + <button + follows="left|top|right" + font="SansSerifSmallBold" + height="25" + label="Teleport" + layout="topleft" + name="teleport_btn" + width="65" /> + </layout_panel> + <layout_panel + default_tab_group="1" + enabled="false" + follows="left|top|right" + height="25" + layout="topleft" + left_pad="0" + min_width="50" + name="share_btn_panel" + top_delta="0" + visible="false" + width="50"> + <button + enabled="false" + follows="top|left|right" + font="SansSerifSmallBold" + height="25" + label="Share" + layout="topleft" + name="share_btn" + width="50" /> + </layout_panel> +<!-- <layout_panel + default_tab_group="1" + follows="left|top|right" + height="25" + layout="topleft" + left_pad="0" + min_width="40" + name="more_btn_panel" + top_delta="0" + width="40"> + <button + enabled="false" + follows="top|right" + font="SansSerifSmallBold" + height="25" + label=">>" + layout="topleft" + name="more_btn" + width="40" /> + </layout_panel>--> + </layout_stack> <string name="people_filter_label"> Filter People </string> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 2a49db8d4f..904f8bde65 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -1,494 +1,277 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - bevel_style="in" + bevel_style="out" follows="left|top|right|bottom" height="570" - width="295" - border="false" + label="Profile" layout="topleft" left="0" + name="panel_profile" top="0" - label="Profile" - mouse_opaque="false" - name="panel_profile"> - <panel.string + width="255"> + <string name="CaptionTextAcctInfo"> [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION] - </panel.string> - <panel.string - name="AcctTypeResident"> - Resident - </panel.string> - <panel.string - name="AcctTypeTrial"> - Trial - </panel.string> - <panel.string - name="AcctTypeCharterMember"> - Charter Member - </panel.string> - <panel.string - name="AcctTypeEmployee"> - Linden Lab Employee - </panel.string> - <panel.string - name="PaymentInfoUsed"> - Payment Info Used - </panel.string> - <panel.string - name="PaymentInfoOnFile"> - Payment Info On File - </panel.string> - <panel.string - name="NoPaymentInfoOnFile"> - No Payment Info On File - </panel.string> - <panel.string - name="AgeVerified"> - Age-verified - </panel.string> - <panel.string - name="NotAgeVerified"> - Not Age-verified - </panel.string> - <panel.string + </string> + <string + name="AcctTypeResident" + value="Resident" /> + <string + name="AcctTypeTrial" + value="Trial" /> + <string + name="AcctTypeCharterMember" + value="Charter Member" /> + <string + name="AcctTypeEmployee" + value="Linden Lab Employee" /> + <string + name="PaymentInfoUsed" + value="Payment Info Used" /> + <string + name="PaymentInfoOnFile" + value="Payment Info On File" /> + <string + name="NoPaymentInfoOnFile" + value="No Payment Info On File" /> + <string + name="AgeVerified" + value="Age-verified" /> + <string + name="NotAgeVerified" + value="Not Age-verified" /> + <string name="payment_update_link_url"> http://www.secondlife.com/account/billing.php?lang=en - </panel.string> - <panel.string - name="my_account_link_url"> - http://secondlife.com/account - </panel.string> - <panel.string + </string> + <string + name="my_account_link_url" + value="http://secondlife.com/account" /> + <string name="partner_edit_link_url"> http://www.secondlife.com/account/partners.php?lang=en - </panel.string> - <panel.string - name="no_partner_text"> - None - </panel.string> + </string> + <string + name="no_partner_text" + value="None" /> <scroll_container color="DkGray2" follows="left|top|right|bottom" height="570" - width="265" layout="topleft" - left="5" - top_pad="0" - border="false" - opaque="true" + left="0" name="profile_scroll" - reserve_scroll_corner="false"> - <panel - height="300" + opaque="true" + width="255"> + <panel + bevel_style="in" + follows="left|top" + height="125" layout="topleft" - left="0" - top="0" - bevel_style="in" - width="265"> - <panel - follows="left|top" - height="100" - layout="topleft" - left="10" - bevel_style="in" - name="second_life_image_panel" - top="20" - width="230"> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - follows="top|left" - height="125" - layout="topleft" - left="0" - name="2nd_life_pic" - top="0" - width="125" /> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" + left="10" + name="second_life_image_panel" + top="10" + width="260"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="125" layout="topleft" - left_pad="10" - name="title_sl_descr_text" - text_color="white" - top_delta="0" - width="125"> - Second Life: - </text> + left="10" + name="2nd_life_pic" + top="10" + width="125" /> <text - type="string" - left_pad="10" - top_pad="5" follows="left|top|right" - font="SansSerifSmall" - height="125" - layout="topleft" - name="sl_description_edit" - text_color="LtGray" - width="125" - word_wrap="true"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> - </panel> - <panel - follows="left|top" - height="100" - layout="topleft" - left="10" - name="first_life_image_panel" - top_pad="20" - width="125"> - <texture_picker - allow_no_texture="true" - default_image_name="None" - enabled="false" - follows="top|left" - height="125" - layout="topleft" - left="0" - name="real_world_pic" - top_pad="0" - width="125" /> - <text - type="string" - follows="left|top" font="SansSerifBold" height="15" layout="topleft" left_pad="10" - name="title_rw_descr_text" + name="title_sl_descr_text" text_color="white" top_delta="0" - width="125"> - Real World: - </text> + value="Second Life:" + width="140" /> <text - type="string" follows="left|top|right" - font="SansSerifSmall" - height="125" + height="90" layout="topleft" - left_pad="10" - top_pad="10" - name="fl_description_edit" - text_color="LtGray" - width="125" + name="sl_description_edit" + width="130" word_wrap="true"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> - </panel> - <link - type="string" - follows="left|top|right" - font="SansSerifSmall" - height="15" - top_pad="20" - layout="topleft" - left="10" - name="homepage_edit" - text_color="HTMLLinkColor" - hover_color="0.5 0.4 1 1" - width="280"> - TODO - </link> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - halign="right" + </panel> + <panel + follows="left|top" + height="125" + layout="topleft" + left="10" + name="first_life_image_panel" + width="260"> + <texture_picker + allow_no_texture="true" + default_image_name="None" + enabled="false" + follows="top|left" + height="125" layout="topleft" - left="10" - name="title_member_text" - text_color="white" - top_pad="20" - width="100"> - Member since: - </text> + left="0" + name="real_world_pic" + width="125" /> <text - type="string" follows="left|top|right" - font="SansSerifSmall" - height="15" - layout="topleft" - left_pad="10" - top_delta="0" - name="register_date" - text_color="LtGray" - width="125" - word_wrap="true"> - 05/31/1976 - </text> - <text - type="string" - follows="left|top" font="SansSerifBold" height="15" - halign="right" - layout="topleft" - left="10" - top_pad="20" - name="title_acc_status_text" - text_color="white" - width="100"> - Status: - </text> - <text - type="string" - follows="left|top|right" - font="SansSerifSmall" - height="30" layout="topleft" left_pad="10" - top_delta="0" - name="acc_status_text" - text_color="LtGray" - width="125" - word_wrap="true"> - Resident. No payment info on file. - </text> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - halign="right" - layout="topleft" - name="title_partner_text" + name="title_rw_descr_text" text_color="white" - top_pad="20" - left="10" - width="100"> - Partner: - </text> - <panel - follows="left|top|right" - height="15" - layout="topleft" - left_pad="10" top_delta="0" - name="partner_data_panel" - width="125"> - <text - type="string" - follows="left|top|right" - font="SansSerifSmall" - height="15" - layout="topleft" - left="0" - name="partner_text" - text_color="LtGray" - top="0" - width="125" - word_wrap="true"> - [FIRST] [LAST] - </text> - <link - type="string" - follows="top|right" - font="SansSerifSmall" - height="15" - layout="topleft" - left_delta="0" - name="partner_edit_link" - text_color="HTMLLinkColor" - hover_color="0.5 0.4 1 1" - top_delta="15" - width="40"> - Edit - </link> - </panel> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - halign="right" - left="10" - name="title_groups_text" - text_color="white" - top_pad="20" - width="100"> - Groups: - </text> + value="Real World:" + width="140" /> <text - type="string" - follows="left|top|right|bottom" - font="SansSerifSmall" - height="120" + follows="left|top|right" + height="90" layout="topleft" - left_pad="10" - top_delta="0" - name="sl_groups" - text_color="LtGray" - width="125" + name="fl_description_edit" + width="130" word_wrap="true"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. + Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. </text> - <!--panel + </panel> + <link + follows="left|top|right" + height="15" + hover_color="0.5 0.4 1 1" + layout="topleft" + left="10" + name="homepage_edit" + text_color="HTMLLinkColor" + top_pad="5" + value="http://librarianavengers.org" + width="265" + word_wrap="true" /> + <text + follows="left|top" + font="SansSerifBold" + halign="right" + height="15" + layout="topleft" + left="10" + name="title_member_text" + text_color="white" + top_pad="10" + value="Member since:" + width="100" /> + <text + follows="left|top|right" + height="15" + layout="topleft" + left_pad="10" + name="register_date" + top_delta="0" + value="05/31/1976" + width="160" + word_wrap="true" /> + <text + follows="left|top" + font="SansSerifBold" + halign="right" + height="15" + layout="topleft" + left="10" + name="title_acc_status_text" + text_color="white" + top_pad="20" + value="Status:" + width="100" /> + <text + follows="left|top|right" + height="30" + layout="topleft" + left_pad="10" + name="acc_status_text" + top_delta="0" + value="Resident. No payment info on file." + width="160" + word_wrap="true" /> + <text + follows="left|top" + font="SansSerifBold" + halign="right" + height="15" + layout="topleft" + left="10" + name="title_partner_text" + text_color="white" + top_pad="20" + value="Partner:" + width="100" /> + <panel + follows="left|top|right" + height="15" + layout="topleft" + left_pad="10" + name="partner_data_panel" + top_delta="0" + width="125"> + <text follows="left|top|right" height="15" layout="topleft" - left="50" - top_pad="30" - name="account_actions_panel" - width="200"> - <link - type="string" - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="0" - name="payment_update_link" - text_color="HTMLLinkColor" - hover_color="0.5 0.4 1 1" - top="0" - width="100"> - Update - </link> - <link - follows="left|top" - font="SansSerif" - height="15" - layout="topleft" - left="70" - name="my_account_link" - text_color="HTMLLinkColor" - hover_color="0.5 0.4 1 1" - top="0" - width="80"> - My Account - </link> - </panel--> - - - - <!-- - <panel - follows="left|top|right" - height="30" - layout="topleft" left="0" - name="status_panel" - top="155" - width="260"> - <text - follows="left|top" - font="SansSerifBold" - font.style="ITALIC" - height="15" - layout="topleft" - left="9" - name="online_status" - text_color="green" - width="100" /> - <text - type="string" - follows="left|top" - font="SansSerifBold" - font.style="ITALIC" - height="15" - layout="topleft" - left="9" - name="status_message" - text_color="0.1 0.1 0.1 1" - width="280"> - TBD - </text> - </panel> --> - <!--panel - follows="left|top|right" - height="80" + name="partner_text" + top="0" + value="[FIRST] [LAST]" + width="160" + word_wrap="true" /> + <link + follows="top|right" + height="15" + hover_color="0.5 0.4 1 1" layout="topleft" - left="0" - name="status_me_panel" - top_pad="20" - width="125"> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - halign="right" - layout="topleft" - left="10" - name="online_me_status_text" - text_color="white" - width="100"> - Status: - </text> - <combo_box - font="SansSerifBold" - height="18" - layout="topleft" - left_pad="10" - top_delta="0" - name="status_combo" - width="100"> - <combo_box.item - label="Online" - name="online" - value="online" /> - <combo_box.item - label="Away" - name="away" - value="away" /> - <combo_box.item - label="Busy" - name="busy" - value="busy" /> - </combo_box> - <text - type="string" - follows="left|top" - font="SansSerifBold" - height="15" - layout="topleft" - left="10" - top_pad="20" - name="status_me_message_text" - text_color="white" - width="250"> - What're you up to? - </text> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerifBold" - font.style="ITALIC" - height="20" - layout="topleft" - left="10" - top_pad="10" - name="status_me_message_edit" - select_on_focus="true" - text_color="0.5 0.5 0.5 1" - width="230"> - Type a message about what you're doing in SL! - </line_editor> - </panel--> - - - - - </panel> - + left_delta="0" + name="partner_edit_link" + text_color="HTMLLinkColor" + top_delta="15" + value="Edit" + width="40" /> + </panel> + <text + follows="left|top" + font="SansSerifBold" + halign="right" + height="15" + layout="topleft" + left="10" + name="title_groups_text" + text_color="white" + top_pad="20" + value="Groups:" + width="100" /> + <text + follows="left|top|right|bottom" + height="160" + layout="topleft" + left_pad="10" + name="sl_groups" + top_delta="0" + width="130" + word_wrap="true"> + Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. + </text> </scroll_container> <panel follows="bottom|left" height="30" - width="280" layout="topleft" left="10" + name="profile_buttons_panel" top_pad="5" - name="profile_buttons_panel"> + width="280"> <button follows="bottom|left" font="SansSerifSmallBold" @@ -506,9 +289,9 @@ height="25" label="IM" layout="topleft" - left_pad="0" name="im" top="0" + left_pad="0" width="40" /> <button enabled="false" @@ -517,8 +300,8 @@ height="25" label="Call" layout="topleft" - left_pad="0" name="call" + left_pad="0" top="0" width="50" /> <button @@ -527,31 +310,20 @@ height="25" label="Teleport" layout="topleft" - left_pad="0" name="teleport" - top="0" - width="75" /> - <!-- <button - enabled="false" - follows="bottom|left" - font="SansSerifSmallBold" - height="25" - label="Share" - layout="topleft" left_pad="0" - name="share" top="0" - width="60" />--> + width="75" /> </panel> - <panel + <panel follows="bottom|left" height="30" - width="280" layout="topleft" left="10" + name="profile_me_buttons_panel" top_pad="5" visible="false" - name="profile_me_buttons_panel"> + width="280"> <button follows="bottom|left" font="SansSerifSmallBold" diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 58be74a598..d404b45ef8 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -1,54 +1,57 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<side_tray - name="sidebar" - background_visible="false" - bg_opaque_color="0.0 0.0 0.0 0.0" - mouse_opaque="true" - width="305" - collapsed="true" +<side_tray + name="sidebar" + background_visible="false" + color="DkGray" + mouse_opaque="true" + width="305" + collapsed="true" > - <sidetray_tab + <sidetray_tab name="sidebar_home" tab_title="Home" description="Home." image="icn_voice-groupfocus.tga" - mouse_opaque="false" - background_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" + mouse_opaque="false" + background_opaque="false" + background_visible="true" +color="DkGray" > - <panel - name="panel_home" - filename="panel_sidetray_home_tab.xml" - label="home" - border="true" + <panel + name="panel_home" + filename="panel_sidetray_home_tab.xml" + label="home" + border="true" + font="SansSerifBold" /> </sidetray_tab> - <sidetray_tab + <sidetray_tab name="sidebar_people" tab_title="People" description="Find your friends, contacts and people nearby." image="TabIcon_People_Off" - mouse_opaque="false" - background_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" + mouse_opaque="false" + background_opaque="false" + background_visible="true" +color="DkGray" > <panel_container name="panel_container" > - <panel - class="panel_people" - name="panel_people" - filename="panel_people.xml" - border="true" + <panel + class="panel_people" + name="panel_people" + filename="panel_people.xml" + border="true" + font="SansSerifBold" /> - <panel - class="panel_profile_view" - name="panel_profile_view" + <panel + class="panel_profile_view" + name="panel_profile_view" filename="panel_profile_view.xml" border="true" + font="SansSerifBold" /> <panel class="panel_group_info_sidetray" @@ -60,532 +63,62 @@ </panel_container> </sidetray_tab> - <sidetray_tab + <sidetray_tab name="sidebar_places" tab_title="Places" label="Places" description="Find places to go and places you've been." - image="TabIcon_Places_Off" - mouse_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" + image="TabIcon_Places_Off" + mouse_opaque="false" + background_visible="true" + color="DkGray" > - <panel - class="panel_places" - name="panel_places" - filename="panel_places.xml" + <panel + class="panel_places" + name="panel_places" + filename="panel_places.xml" label="Places" border="true" /> </sidetray_tab> - - <sidetray_tab + + <sidetray_tab name="sidebar_me" - tab_title="Me" + tab_title="My Profile" description="Change your profile, your look and quick links to your outfits." image="TabIcon_Me_Off" - mouse_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" + mouse_opaque="false" + background_visible="true" + color="DkGray" > - <panel - class="panel_me_profile_view" - name="panel_me_profile" + <panel + class="panel_me_profile_view" + name="panel_me_profile" filename="panel_me_profile.xml" - label="Me" + label="My Profile" border="true" + font="SansSerifBold" /> </sidetray_tab> - <!-- - - <sidetray_tab - name="sidebar_previews" - mouse_opaque="false" - background_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-groupfocus.tga" - tab_title="Previews" - description="Previews." - > - <accordion_tab - name="floater_preview_animation" - title="Preview Animation" - collapsible="true" - expanded="false" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="floater_preview_animation" - name="floater_preview_animation" - filename="floater_preview_animation.xml" - width="280" - height="85" - label="Preview_Animation" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_preview_gesture" - title="Preview Gesture" - collapsible="true" - expanded="false" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="floater_preview_gesture" - name="floater_preview_gesture" - filename="floater_preview_gesture.xml" - width="280" - height="400" - label="Preview_Gesture" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_preview_existing_landmark" - title="Preview Existing Landmark" - collapsible="true" - expanded="false" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="floater_preview_existing_landmark" - name="floater_preview_existing_landmark" - filename="floater_preview_existing_landmark.xml" - width="280" - height="495" - label="Preview_Existing_Landmark" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_preview_sound" - title="Preview Sound" - collapsible="true" - expanded="false" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="floater_preview_sound" - name="floater_preview_sound" - filename="floater_preview_sound.xml" - width="280" - height="85" - label="Preview_Sound" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_preview_url" - title="Preview URL" - collapsible="true" - expanded="false" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="floater_preview_url" - name="floater_preview_url" - filename="floater_preview_url.xml" - width="280" - height="465" - label="Preview_URL" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_URL_entry" - title="URL Entry" - collapsible="true" - expanded="false" - min_width="200" - min_height="200" - header_visible="true" - > - <panel - class="floater_URL_entry" - name="floater_URL_entry" - filename="floater_URL_entry.xml" - width="280" - height="87" - label="URL_entry" - border="true" - /> - </accordion_tab> - </sidetray_tab> - <sidetray_tab - name="sidebar_region" - mouse_opaque="false" - background_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-groupfocus.tga" - tab_title="Region" - description="Region." - > - <accordion_tab - name="panel_region_covenant" - title="Region Covenant" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="panel_region_covenant" - name="panel_region_covenant" - filename="panel_region_covenant.xml" - width="280" - height="350" - label="Panel_Region_Covenant" - border="true" - /> - </accordion_tab> - <accordion_tab - name="panel_region_debug" - title="Region Debug" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="panel_region_debug" - name="panel_region_debug" - filename="panel_region_debug.xml" - width="280" - height="500" - label="Panel_Region_Debug" - border="true" - /> - </accordion_tab> - <accordion_tab - name="panel_region_estate" - title="Region Estate" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="panel_region_estate" - name="panel_region_estate" - filename="panel_region_estate.xml" - width="280" - height="950" - label="Panel_Region_Estate" - border="true" - /> - </accordion_tab> - <accordion_tab - name="panel_region_general" - title="Region General" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="panel_region_general" - name="panel_region_general" - filename="panel_region_general.xml" - width="280" - height="500" - label="Panel_Region_General" - border="true" - /> - </accordion_tab> - <accordion_tab - name="panel_region_terrain" - title="Region Terrain" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="panel_region_terrain" - name="panel_region_terrain" - filename="panel_region_terrain.xml" - width="280" - height="340" - label="Panel_Region_Terrain" - border="true" - /> - </accordion_tab> - <accordion_tab - name="panel_region_texture" - title="Region Texture" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="panel_region_texture" - name="panel_region_texture" - filename="panel_region_texture.xml" - width="280" - height="575" - label="Panel_Region_Texture" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_region_info" - title="Region Info" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_region_info" - name="floater_region_info" - filename="floater_region_info.xml" - width="280" - height="512" - label="Floater_Region_Info" - border="true" - /> - </accordion_tab> - </sidetray_tab> - - <sidetray_tab - name="Build" - mouse_opaque="false" - background_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-groupfocus.tga" - tab_title="Build" - description="Build" - > - <accordion_tab - name="floater_tools" - title="Tools" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_tools" - name="floater_tools" - filename="floater_tools.xml" - width="280" - height="550" - label="Tools" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_bulk_perms" - title="Bulk Perms" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_bulk_perms" - name="floater_bulk_perms" - filename="floater_bulk_perms.xml" - width="280" - height="360" - label="Tools" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_build_options" - title="Build Options" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_build_options" - name="floater_build_options" - filename="floater_build_options.xml" - width="280" - height="151" - label="Tools" - border="true" + <sidetray_tab + name="sidebar_group_temp" + tab_title="Group Temp" + description="Group Information." + image="TabIcon_Me_Off" + mouse_opaque="false" + background_visible="true" + bg_opaque_color="0.5 0.5 0.5 1.0" + > + <panel + class="panel_group_info" + name="panel_group_info" + filename="floater_groupinfo.xml" + label="Groups" + border="true" /> - </accordion_tab> - </sidetray_tab> - <sidetray_tab - name="othertools" - mouse_opaque="false" - background_opaque="false" - background_visible="true" - bg_opaque_color="0.5 0.5 0.5 1.0" - image="icn_voice-groupfocus.tga" - tab_title="Other Tools" - description="Other Tools" - > - <accordion_tab - name="floater_gesture" - title="Gestures" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_gesture" - name="floater_gesture" - filename="floater_gesture.xml" - width="280" - height="465" - label="Gesture" - border="true" - /> - </accordion_tab> - - <accordion_tab - name="floater_buy_contents" - title="Buy Contents" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_buy_contents" - name="floater_buy_contents" - filename="floater_buy_contents.xml" - width="280" - height="250" - label="buy_contents" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_buy_object" - title="Buy Object" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_buy_object" - name="floater_buy_object" - filename="floater_buy_object.xml" - width="280" - height="250" - label="buy_object" - border="true" - /> - </collapsible_ctrl> - <accordion_tab - name="floater_inventory_view_finder" - title="Inventory View Finder" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_inventory_view_finder" - name="floater_inventory_view_finder" - filename="floater_inventory_view_finder.xml" - width="280" - height="408" - label="view_finder" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_mute" - title="Mute" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_mute" - name="floater_mute" - filename="floater_mute.xml" - width="280" - height="300" - label="mute" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_sell_land" - title="Sell Land" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_sell_land" - name="floater_sell_land" - filename="floater_sell_land.xml" - width="280" - height="600" - label="sell_land" - border="true" - /> - </accordion_tab> - <accordion_tab - name="floater_telehub" - title="Telehub" - collapsible="true" - min_width="200" - min_height="200" - expanded="false" - header_visible="true" - > - <panel - class="floater_telehub" - name="floater_telehub" - filename="floater_telehub.xml" - width="280" - height="250" - label="telehub" - border="true" - /> - </accordion_tab> - - </sidetray_tab> - --> <sidetray_tab name="sidebar_appearance" @@ -607,4 +140,3 @@ </side_tray> - diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index f10161cecd..6aa42185f7 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -1,115 +1,201 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<!-- All our XML is utf-8 encoded. --> - +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - name="home_tab" - title="home_tab" - visible="true" - width="300" - height="420" - background_opaque="false" - background_visible="true" - bevel_style="in" - follows="left|top|right|bottom"> - <panel - left="10" width="280" height="130" - background_visible="true" - background_opaque="false" - bg_alpha_color="0.3 0.3 0.3 1.0" - name="sidebar_people" - follows="left|top|right" - class="panel_sidetray_home_info"> - <text - top="-10" width="200" left="5" height="30" follows="left|right|top" - font="SansSerifHugeBold" text_color="white" word_wrap="true" - mouse_opaque="false" name="tab_name" > - People - </text> - <icon - top="-10" right="-10" width="20" height="20" follows="top|right" - color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga" - mouse_opaque="false" name="tab_icon"/> - <text - top="-40" left="10" right="-10" height="120" follows="left|right|bottom" - font="SansSerifBig" text_color="white" word_wrap="true" - mouse_opaque="false" name="tab_description" > - Find your friends, contacts and people nearby. - </text> - </panel> - <panel - left="10" width="280" height="130" - background_visible="true" - background_opaque="false" - bg_alpha_color="0.3 0.3 0.3 1.0" - name="sidebar_places" - follows="left|top|right" - class="panel_sidetray_home_info"> - <text - top="-10" width="200" left="5" height="30" follows="left|right|top" - font="SansSerifHugeBold" text_color="white" word_wrap="true" - mouse_opaque="false" name="tab_name" > - Places - </text> - <icon - top="-10" right="-10" width="20" height="20" follows="top|right" - color="1 1 1 1" enabled="true" image_name="inv_item_landmark.tga" - mouse_opaque="false" name="tab_icon"/> - <text - top="-40" left="10" right="-10" height="120" follows="left|right|bottom|top" - font="SansSerifBig" text_color="white" word_wrap="true" - mouse_opaque="false" name="tab_description" > - Find your friends, contacts and people nearby. - </text> - </panel> - <panel - left="10" width="280" height="130" - background_visible="true" - background_opaque="false" - bg_alpha_color="0.3 0.3 0.3 1.0" - name="sidebar_me" - follows="left|top|right" - class="panel_sidetray_home_info"> - <text - top="-10" width="200" left="5" height="30" follows="left|right|top" - font="SansSerifHugeBold" text_color="white" word_wrap="true" - mouse_opaque="false" name="tab_name" > - Me - </text> - <icon - top="-10" right="-10" width="20" height="20" follows="top|right" - color="1 1 1 1" enabled="true" image_name="icn_voice-pvtfocus.tga" - mouse_opaque="false" name="tab_icon"/> - <text - top="-40" left="10" right="-10" height="120" follows="left|right|bottom" - font="SansSerifBig" text_color="white" word_wrap="true" - mouse_opaque="false" name="tab_description" > - Change your profile, your look and quick links to your outfits. - </text> - </panel> - <panel - left="10" width="280" height="130" - background_visible="true" - background_opaque="false" - bg_alpha_color="0.3 0.3 0.3 1.0" - name="sidebar_appearance" - follows="left|top|right" - class="panel_sidetray_home_info"> - <text - top="-10" width="200" left="5" height="30" follows="left|right|top" - font="SansSerifHugeBold" text_color="white" word_wrap="true" - mouse_opaque="false" name="tab_name" > - Appearance - </text> - <icon - top="-10" right="-10" width="20" height="20" follows="top|right" - color="1 1 1 1" enabled="true" image_name="inv_item_shirt.tga" - mouse_opaque="false" name="tab_icon"/> - <text - top="-40" left="10" right="-10" height="120" follows="left|right|bottom" - font="SansSerifBig" text_color="white" word_wrap="true" - mouse_opaque="false" name="tab_description" > - Change your appearance. - </text> - </panel> -</panel> -
\ No newline at end of file + background_visible="true" + bevel_style="in" + follows="left|top|right|bottom" + height="420" + label="home_tab" + layout="topleft" + name="home_tab" + width="300"> + <panel + background_visible="true" + bg_alpha_color="DkGray2" + class="panel_sidetray_home_info" + follows="left|top|right" + height="130" + layout="topleft" + left="10" + name="sidebar_people" + width="280"> + <text + follows="left|right|top" + font="SansSerifBigBold" + height="30" + layout="topleft" + left="5" + mouse_opaque="false" + name="tab_name" + text_color="white" + top="10" + value="People" + width="200" + word_wrap="true" /> + <icon + color="DkGray" + follows="top|right" + height="20" + layout="topleft" + name="tab_icon" + right="-10" + top="10" + width="20" /> + <text + follows="left|right|bottom" + font="SansSerifBold" + height="120" + layout="topleft" + left="10" + mouse_opaque="false" + name="tab_description" + right="-10" + text_color="white" + top="40" + word_wrap="true"> + Find your friends, contacts and people nearby. + </text> + </panel> + <panel + background_visible="true" + bg_alpha_color="DkGray2" + class="panel_sidetray_home_info" + follows="left|top|right" + height="130" + layout="topleft" + left="10" + name="sidebar_places" + width="280"> + <text + follows="left|right|top" + font="SansSerifBigBold" + height="30" + layout="topleft" + left="5" + mouse_opaque="false" + name="tab_name" + text_color="white" + top="10" + value="Places" + width="200" + word_wrap="true" /> + <icon + color="DkGray" + follows="top|right" + height="20" + image_name="TabIcon_Places_Off" + layout="topleft" + name="tab_icon" + right="-10" + top="10" + width="20" /> + <text + follows="left|right|bottom|top" + font="SansSerifBold" + height="120" + layout="topleft" + left="10" + mouse_opaque="false" + name="tab_description" + right="-10" + text_color="white" + top="40" + word_wrap="true"> + Find your friends, contacts and people nearby. + </text> + </panel> + <panel + background_visible="true" + bg_alpha_color="DkGray2" + class="panel_sidetray_home_info" + follows="left|top|right" + height="130" + layout="topleft" + left="10" + name="sidebar_me" + width="280"> + <text + follows="left|right|top" + font="SansSerifBigBold" + height="30" + layout="topleft" + left="5" + mouse_opaque="false" + name="tab_name" + text_color="white" + top="10" + value="My Profile" + width="200" + word_wrap="true" /> + <icon + color="DkGray" + follows="top|right" + height="20" + layout="topleft" + name="tab_icon" + right="-10" + top="10" + width="20" /> + <text + follows="left|right|bottom" + font="SansSerifBold" + height="120" + layout="topleft" + left="10" + mouse_opaque="false" + name="tab_description" + right="-10" + text_color="white" + top="40" + word_wrap="true"> + Change your profile, your look and quick links to your outfits. + </text> + </panel> + <panel + background_opaque="false" + background_visible="true" + bg_alpha_color="0.3 0.3 0.3 1.0" + class="panel_sidetray_home_info"> + follows="left|top|right" + height="130" + left="10" + name="sidebar_appearance" + width="280" + <text + follows="left|right|top" + font="SansSerifHugeBold" + height="30" + left="5" + mouse_opaque="false" + name="tab_name" > + text_color="white" + width="200" + word_wrap="true" + top="-10" + Appearance + </text> + <icon + top="-10" + right="-10" + width="20" + height="20" + follows="top|right" + color="1 1 1 1" + enabled="true" + image_name="inv_item_shirt.tga" + mouse_opaque="false" + name="tab_icon"/> + <text + top="-40" + left="10" + right="-10" + height="120" + follows="left|right|bottom" + font="SansSerifBig" + text_color="white" + word_wrap="true" + mouse_opaque="false" + name="tab_description" > + Change your appearance. + </text> + </panel> +</panel> |