diff options
Diffstat (limited to 'indra/newview/skins')
23 files changed, 295 insertions, 313 deletions
diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png Binary files differnew file mode 100644 index 0000000000..98f1f04b9a --- /dev/null +++ b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Alpha.png b/indra/newview/skins/default/textures/icons/Inv_Alpha.png Binary files differnew file mode 100644 index 0000000000..e8d246c6fa --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Alpha.png diff --git a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png Binary files differnew file mode 100644 index 0000000000..e8d246c6fa --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png Binary files differnew file mode 100644 index 0000000000..d4f126f969 --- /dev/null +++ b/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 4aafe462b7..cf7ab46dd5 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -67,7 +67,9 @@ <texture name="ComboButton_Over" file_name="widgets/ComboButton_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Press" file_name="widgets/ComboButton_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="ComboButton_UpSelected" file_name="widgets/ComboButton_UpSelected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> + <texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="Container" file_name="containers/Container.png" preload="false" /> <texture name="DisclosureArrow_Closed_Off" file_name="widgets/DisclosureArrow_Closed_Off.png" preload="true" /> @@ -89,6 +91,7 @@ <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" /> <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" /> <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="false" /> + <texture name="Favorite_Link_Over" file_name="navbar/Favorite_Link_Over.png" preload="false" /> <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="false" scale.left="2" scale.top="0" scale.right="2" scale.bottom="0" /> <texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="false" /> @@ -233,6 +236,8 @@ <texture name="NearbyVoice_Lvl3" file_name="bottomtray/NearbyVoice_Lvl3.png" preload="false" /> <texture name="NearbyVoice_On" file_name="bottomtray/NearbyVoice_On.png" preload="false" /> + <texture name="Notices_Unread" file_name="bottomtray/Notices_Unread.png" preload="true" /> + <texture name="Object_Cone" file_name="build/Object_Cone.png" preload="false" /> <texture name="Object_Cube" file_name="build/Object_Cube.png" preload="false" /> <texture name="Object_Cylinder" file_name="build/Object_Cylinder.png" preload="false" /> diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png Binary files differnew file mode 100644 index 0000000000..2330cb420b --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png Binary files differnew file mode 100644 index 0000000000..b7b5c2e1d4 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index c35cbb1539..361f5a7bc8 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -9,10 +9,10 @@ image_disabled_selected="transparent.j2c" image_selected="transparent.j2c" image_unselected="transparent.j2c" - image_hover_selected="FileMenu_BarSelect" - image_hover_unselected="FileMenu_BarSelect" - image_pressed="FileMenu_BarSelect" - image_pressed_selected="FileMenu_BarSelect" + image_hover_selected="Favorite_Link_Over" + image_hover_unselected="Favorite_Link_Over" + image_pressed="Favorite_Link_Over" + image_pressed_selected="Favorite_Link_Over" hover_glow_amount="0.15" layout="topleft" left="0" diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index a6dcb45e7a..6c4f10e61e 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -193,7 +193,7 @@ font="SansSerif" height="16" layout="topleft" - left="26" + left="8" name="title" top="8" width="355"> @@ -299,7 +299,7 @@ scratch and wear it. left="8" name="Create New" top="104" - width="120" /> + width="140" /> <button follows="right|bottom" height="20" @@ -342,9 +342,10 @@ scratch and wear it. top="4" width="18" /> <icon + follows="left|top" height="16" layout="topleft" - left_delta="-325" + left="8" mouse_opaque="true" top_delta="3" width="16" /> @@ -399,7 +400,7 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left="26" + left="8" name="title" top="8" width="355"> @@ -599,7 +600,7 @@ scratch and wear it. <icon height="16" layout="topleft" - left_delta="-325" + left="8" mouse_opaque="true" top_delta="3" width="16" /> @@ -654,7 +655,7 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left="26" + left="8" name="title" top="8" width="355"> @@ -1015,7 +1016,7 @@ scratch and wear it. <icon height="16" layout="topleft" - left_delta="-325" + left="8" mouse_opaque="true" top_delta="3" width="16" /> @@ -1100,7 +1101,7 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left="26" + left="8" name="title" top="8" width="355"> @@ -1221,7 +1222,7 @@ scratch and wear it. <icon height="16" layout="topleft" - left_delta="-325" + left="8" mouse_opaque="true" top_delta="3" width="16" /> @@ -1306,7 +1307,7 @@ scratch and wear it. font="SansSerif" height="16" layout="topleft" - left="26" + left="8" name="title" top="8" width="355"> @@ -3378,16 +3379,6 @@ scratch and wear it. layout="topleft" name="panel_list" /> </scroll_container> - <button - bottom="536" - follows="right|bottom" - height="20" - label="Make Outfit" - label_selected="Make Outfit" - layout="topleft" - name="make_outfit_btn" - right="-216" - width="100" /> <button bottom="536" follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 88aca005cf..70af2f63b6 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -3,7 +3,7 @@ legacy_header_height="18" background_visible="true" follows="left|top|right|bottom" - height="359" + height="369" layout="topleft" left="0" name="panel_im" @@ -12,13 +12,13 @@ can_dock="true" can_minimize="true" visible="true" - width="400" + width="520" can_resize="true" - min_width="200" - min_height="150"> + min_width="350" + min_height="350"> <layout_stack follows="left|top|right|bottom" - height="344" - width="400" + height="354" + width="520" layout="topleft" orientation="horizontal" name="im_panels" @@ -28,13 +28,13 @@ name="panel_im_control_panel" layout="topleft" top_delta="-3" - height="344" + height="354" follows="left" label="IM Control Panel" auto_resize="false" user_resize="false" /> - <layout_panel height="344" - width="235" + <layout_panel height="354" + width="355" left_delta="146" top="0" user_resize="false"> @@ -56,14 +56,20 @@ length="1" follows="left|top|right|bottom" font="SansSerif" - height="290" + height="300" layout="topleft" name="chat_history" parse_highlights="true" allow_html="true" - width="230"> + width="350"> </chat_history> - <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="225"> + <line_editor + follows="left|right" + height="20" + label="To" + layout="topleft" + name="chat_editor" + width="345"> </line_editor> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml index 8d230023cc..1946920a9c 100644 --- a/indra/newview/skins/default/xui/en/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml @@ -8,32 +8,14 @@ help_topic="give_money" save_rect="true" width="225"> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifBold" - height="18" - layout="topleft" - left="12" - name="payee_group" - top="7" - width="75"> - Pay group: - </text> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifBold" - height="18" - layout="topleft" - left="12" - name="payee_resident" - top="7" - width="75"> - Pay resident: - </text> + <string + name="payee_group"> + Pay Group + </string> + <string + name="payee_resident"> + Pay Resident + </string> <icon height="16" width="16" @@ -41,7 +23,7 @@ mouse_opaque="true" name="icon_person" tool_tip="Person" - top_pad="0" + top_pad="24" left="10" /> <text diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index 8bd4bb76c6..1365a0483f 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -151,10 +151,11 @@ This is a really long description for an object being as how it is at least 80 c width="75" /> <icon name="secure_browsing" - image_name="map_infohub.tga" + image_name="Lock" left_delta="80" - width="16" - height="16" + visible="false" + width="18" + height="18" top_delta="2" tool_tip="Secure Browsing" follows="left|top"/> diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml index 2bec745410..6dd44255bf 100644 --- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml @@ -13,4 +13,15 @@ function="CheckControl" parameter="GroupListShowIcons" /> </menu_item_check> + <menu_item_check + label="Leave Selected Group" + layout="topleft" + name="Leave Selected Group"> + <menu_item_check.on_click + function="People.Groups.ViewSort.Action" + parameter="show_icons" /> + <menu_item_check.on_check + function="CheckControl" + parameter="GroupListShowIcons" /> + </menu_item_check> </menu> diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml index 87c4e2787f..0246e21d25 100644 --- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - name="panel_im_control_panel" - width="180" + border="false" height="215" - border="false"> + name="panel_im_control_panel" + width="180"> + <avatar_list color="DkGray2" follows="left|top|right|bottom" @@ -15,25 +16,48 @@ opaque="false" show_info_btn="false" show_profile_btn="false" + show_speaking_indicator="false" top="10" - width="180" /> - <button - name="call_btn" - label="Call" - left_delta="27" - width="125" - height="20" /> - <button - name="end_call_btn" - label="End Call" - width="125" - height="20" - visible="false"/> - <button - enabled="false" - name="voice_ctrls_btn" - label="Open Voice Controls" - width="125" - height="20" - visible="false"/> + width="180"/> + + <panel + background_visible="true" + bg_alpha_color="0.2 0.2 0.2 1" + border="false" + bottom="1" + follows="left|bottom" + height="70" + left="0" + left_pad="0" + name="panel_call_buttons" + top_pad="0" + width="180"> + + <button + bottom="10" + height="20" + label="Call" + left_delta="28" + name="call_btn" + width="125"/> + + <button + bottom="40" + height="20" + label="Leave Call" + name="end_call_btn" + visible="false" + width="125"/> + + <button + enabled="false" + bottom="10" + height="20" + label="Open Voice Controls" + name="voice_ctrls_btn" + visible="false" + width="125"/> + + </panel> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 3149a1f7b3..dcfd0af36e 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -93,7 +93,7 @@ min_width="76" name="gesture_panel" user_resize="false"> - <gesture_combo_box + <button follows="right" height="23" label="Gesture" @@ -258,11 +258,11 @@ user_resize="false"> <chiclet_notification follows="right" - height="25" + height="23" layout="topleft" left="0" name="sys_well" - top="3" + top="4" width="34"> <button auto_resize="true" @@ -271,7 +271,10 @@ follows="right" flash_color="EmphasisColor" name="Unread" - image_overlay="Widget_UpArrow" /> + picture_style="true" + image_overlay="Notices_Unread" + width="20" + /> <unread_notifications width="34" height="23" @@ -288,6 +291,6 @@ layout="topleft" right="-1" top="0" - width="10"/> + width="26"/> </layout_stack> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index 3358015335..763dd7b922 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - name="panel_im_control_panel" - width="180" + border="false" height="238" - border="false"> + name="panel_im_control_panel" + width="180"> + <avatar_list color="DkGray2" follows="left|top|right|bottom" @@ -15,30 +16,56 @@ opaque="false" show_info_btn="false" show_profile_btn="false" + show_speaking_indicator="false" top="10" - width="180" /> - <button - name="group_info_btn" - label="Group Info" - left_delta="27" - width="125" - height="20" /> + width="180"/> + <button - name="call_btn" - label="Call" - width="125" - height="20" /> - <button - name="end_call_btn" - label="End Call" - width="125" - height="20" - visible="false"/> - <button - enabled="false" - name="voice_ctrls_btn" - label="Open Voice Controls" - width="125" + bottom_pad="0" height="20" - visible="false"/> + label="Group Info" + left_delta="28" + name="group_info_btn" + width="125"/> + + <panel + background_visible="true" + bg_alpha_color="0.2 0.2 0.2 1" + border="false" + bottom="1" + follows="left|bottom" + height="70" + left="0" + left_pad="0" + name="panel_call_buttons" + top_pad="0" + width="180"> + + <button + bottom="10" + height="20" + label="Call Group" + left_delta="28" + name="call_btn" + width="125"/> + + <button + bottom="40" + height="20" + label="Leave Call" + name="end_call_btn" + visible="false" + width="125"/> + + <button + enabled="false" + bottom="10" + height="20" + label="Open Voice Controls" + name="voice_ctrls_btn" + visible="false" + width="125"/> + + </panel> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 9d360cea0c..de1323d9cb 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -126,7 +126,7 @@ background_visible="true" <accordion_tab expanded="true" layout="topleft" - name="tab_general" + name="group_general_tab" title="General"> <scroll_container color="DkGray2" @@ -141,11 +141,12 @@ background_visible="true" width="333"> <panel border="false" + class="panel_group_general" filename="panel_group_general.xml" layout="topleft" left="0" help_topic="group_general_tab" - name="general_tab" + name="group_general_tab_panel" top="0" width="303" /> </scroll_container> @@ -153,7 +154,7 @@ background_visible="true" <accordion_tab expanded="false" layout="topleft" - name="tab_roles" + name="group_roles_tab" title="Roles"> <scroll_container color="DkGray2" @@ -168,11 +169,12 @@ background_visible="true" width="333"> <panel border="false" + class="panel_group_roles" filename="panel_group_roles.xml" layout="topleft" left="0" help_topic="group_roles_tab" - name="roles_tab" + name="group_roles_tab_panel" top="0" width="303" /> </scroll_container> @@ -180,7 +182,7 @@ background_visible="true" <accordion_tab expanded="false" layout="topleft" - name="tab_notices" + name="group_notices_tab" title="Notices"> <scroll_container color="DkGray2" @@ -195,11 +197,12 @@ background_visible="true" width="333"> <panel border="false" + class="panel_group_notices" filename="panel_group_notices.xml" layout="topleft" left="0" help_topic="group_notices_tab" - name="notices_tab" + name="group_notices_tab_panel" top="0" width="303" /> </scroll_container> @@ -207,7 +210,7 @@ background_visible="true" <accordion_tab expanded="false" layout="topleft" - name="tab_notices" + name="group_land_tab" title="Land/Assets"> <scroll_container color="DkGray2" @@ -222,11 +225,12 @@ background_visible="true" width="333"> <panel border="false" + class="panel_group_land_money" filename="panel_group_land_money.xml" layout="topleft" left="0" help_topic="group_land_money_tab" - name="land_money_tab" + name="group_land_tab_panel" top="0" width="313" /> </scroll_container> diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 0dd3878426..c8b134cdf0 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -1,64 +1,101 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="panel_im_control_panel" - width="128" - height="327" - border="false"> +<panel + border="false" + height="350" + name="panel_im_control_panel" + width="131"> - <avatar_icon name="avatar_icon" - follows="left|top" - left_delta="3" - width="125" - height="125" /> + <avatar_icon + follows="left|top" + height="125" + left_delta="3" + name="avatar_icon" + top="-10" + width="125"/> - <button name="view_profile_btn" - follows="left|bottom" - label="View Profile" - width="125" - height="20" /> + <text + follows="left|right" + font="SansSerifBig" + height="16" + layout="topleft" + name="avatar_name" + use_ellipses="true" + value="Unknown" + width="125" /> - <button name="add_friend_btn" - follows="left|bottom" - label="Add Friend" - width="125" - height="20" /> + <button + follows="left|bottom" + height="20" + label="View Profile" + name="view_profile_btn" + width="125"/> - <button name="call_btn" - follows="left|bottom" - label="Call" - width="125" - height="20" /> + <button + follows="left|bottom" + height="20" + label="Add Friend" + name="add_friend_btn" + width="125"/> <button follows="left|bottom" height="20" - label="End Call" - name="end_call_btn" - visible="false" - width="125" /> + label="Teleport" + name="teleport_btn" + width="125"/> + + <button + follows="left|bottom" + height="20" + label="Share" + name="share_btn" + width="125"/> - <button - enabled="false" + <button follows="left|bottom" - name="voice_ctrls_btn" - label="Open Voice Controls" - width="125" height="20" - visible="false"/> + label="Pay" + name="pay_btn" + width="125"/> + + <panel + background_visible="true" + bg_alpha_color="0.2 0.2 0.2 1" + border="false" + bottom="1" + follows="left|bottom" + height="70" + left="0" + left_pad="0" + name="panel_call_buttons" + top_pad="0" + width="131"> + + <button + bottom="10" + height="20" + label="Call" + left_delta="3" + name="call_btn" + width="125"/> + + <button + bottom="40" + height="20" + label="Leave Call" + name="end_call_btn" + visible="false" + width="125"/> + + <button + enabled="false" + bottom="10" + height="20" + label="Open Voice Controls" + name="voice_ctrls_btn" + visible="false" + width="125"/> - <button name="teleport_btn" - follows="left|bottom" - label="Teleport" - width="125" - height="20" /> - <button name="share_btn" - follows="left|bottom" - label="Share" - width="125" - height="20" /> - <button name="pay_btn" - follows="left|bottom" - label="Pay" - width="125" - height="20" /> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index e1b3cbf1c8..cdce073a9e 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -12,7 +12,7 @@ <icon follows="all" image_name="NavBar_BG" - mouse_opaque="true" + mouse_opaque="false" name="bg_icon" scale_image="true" visible="true" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index c648b5654e..5ab2e623e4 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -94,6 +94,7 @@ background_visible="true" layout="topleft" left="10" name="nearby_view_sort_btn" + picture_style="true" top="5" width="18" /> <button @@ -105,6 +106,7 @@ background_visible="true" layout="topleft" left_pad="5" name="add_friend_btn" + picture_style="true" top_delta="0" tool_tip="Add selected resident to your friends List" width="18" /> @@ -178,6 +180,7 @@ background_visible="true" layout="topleft" left="10" name="friends_viewsort_btn" + picture_style="true" top="5" width="18" /> <button @@ -189,6 +192,7 @@ background_visible="true" layout="topleft" left_pad="5" name="add_btn" + picture_style="true" tool_tip="Offer friendship to a resident" top_delta="0" width="18" /> @@ -202,6 +206,7 @@ background_visible="true" left_pad="10" right="-10" name="del_btn" + picture_style="true" tool_tip="Remove selected person from your Friends list" top_delta="0" width="18" /> @@ -244,6 +249,7 @@ background_visible="true" layout="topleft" left="10" name="groups_viewsort_btn" + picture_style="true" top="7" width="18" /> <button @@ -255,6 +261,7 @@ background_visible="true" layout="topleft" left_pad="5" name="plus_btn" + picture_style="true" tool_tip="Join group/Create new group" top_delta="0" width="18" /> @@ -267,21 +274,10 @@ background_visible="true" layout="topleft" left_pad="24" name="activate_btn" + picture_style="true" tool_tip="Activate selected group" top_delta="5" width="10" /> - <button - follows="bottom|left" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - left_pad="10" - right="-10" - name="minus_btn" - tool_tip="Leave selected group" - top_delta="-5" - width="18" /> </panel> </panel> <panel @@ -324,6 +320,7 @@ background_visible="true" layout="topleft" left="10" name="recent_viewsort_btn" + picture_style="true" top="7" width="18" /> <button @@ -335,6 +332,7 @@ background_visible="true" layout="topleft" left_pad="5" name="add_friend_btn" + picture_style="true" top_delta="0" tool_tip="Add selected resident to your friends List" width="18" /> diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index e1b197b5d1..b300bd0141 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -291,30 +291,11 @@ <icon follows="top|left" height="16" - image_name="parcel_drk_M" - layout="topleft" - left="20" - name="icon_M" - top="0" - width="18" /> - <icon - follows="top|left" - height="16" - image_name="parcel_drk_R" - layout="topleft" - left="20" - name="icon_R" - top="0" - width="18" /> - <icon - follows="top|left" - height="16" image_name="parcel_drk_PG" layout="topleft" left="20" - name="icon_PG" + name="rating_icon" top="0" - visible="false" width="18" /> <text follows="left|top" @@ -331,7 +312,7 @@ left_pad="0" name="rating_value" top_delta="0" - value="Mature" + value="unknown" width="120" /> <icon follows="top|left" @@ -339,19 +320,9 @@ image_name="parcel_drk_Voice" layout="topleft" left="20" - name="icon_Voice" + name="voice_icon" top_pad="5" width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_VoiceNo" - layout="topleft" - left="20" - name="icon_VoiceNo" - top_delta="0" - visible="false" - width="22" /> <text follows="left|top" height="18" @@ -376,19 +347,9 @@ image_name="parcel_drk_Fly" layout="topleft" left="20" - name="icon_Fly" + name="fly_icon" top_pad="3" width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_FlyNo" - layout="topleft" - left="20" - name="icon_FlyNo" - top_delta="0" - visible="false" - width="22" /> <text follows="left|top" height="16" @@ -412,18 +373,8 @@ image_name="parcel_drk_Push" layout="topleft" left="20" - name="icon_Push" + name="push_icon" top_pad="3" - visible="false" - width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_PushNo" - layout="topleft" - left="20" - name="icon_PushNo" - top_delta="0" width="22" /> <text follows="left|top" @@ -448,18 +399,9 @@ image_name="parcel_drk_Build" layout="topleft" left="20" - name="icon_Build" + name="build_icon" top_pad="3" width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_BuildNo" - layout="topleft" - left="20" - name="icon_BuildNo" - top_delta="0" - visible="false" /> <text follows="left|top" height="14" @@ -483,18 +425,9 @@ image_name="parcel_drk_Scripts" layout="topleft" left="20" - name="icon_Scripts" + name="scripts_icon" top_pad="3" width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_ScriptsNo" - layout="topleft" - left="20" - name="icon_ScriptsNo" - top_delta="0" - visible="false" /> <text follows="left|top" height="14" @@ -518,18 +451,9 @@ image_name="parcel_drk_Damage" layout="topleft" left="20" - name="icon_Damage" + name="damage_icon" top_pad="7" - visible="false" width="22" /> - <icon - follows="top|left" - height="18" - image_name="parcel_drk_DamageNo" - layout="topleft" - left="20" - name="icon_DamageNo" - top_delta="0" /> <text follows="left|top" height="14" @@ -624,30 +548,10 @@ <icon follows="top|left" height="16" - image_name="parcel_drk_M" - layout="topleft" - left_pad="0" - name="icon_M" - width="18" /> - <icon - follows="top|left" - height="16" - image_name="parcel_drk_R" - layout="topleft" - left_delta="0" - name="icon_R" - top_delta="0" - visible="false" - width="18" /> - <icon - follows="top|left" - height="16" image_name="parcel_drk_PG" layout="topleft" - left_delta="0" - name="icon_PG" - top_delta="0" - visible="false" + left_pad="0" + name="region_rating_icon" width="18" /> <text follows="left|top|right" diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 4b5bde690c..cbbcfe5068 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -79,7 +79,7 @@ background_visible="true" left="5" name="teleport_btn" top="0" - width="77" /> + width="100" /> <button follows="bottom|left" font="SansSerifSmall" @@ -89,18 +89,7 @@ background_visible="true" left_pad="5" name="map_btn" top="0" - width="50" /> - <button - enabled="false" - follows="bottom|left" - font="SansSerifSmall" - height="19" - label="Share" - layout="topleft" - left_pad="5" - name="share_btn" - top="0" - width="60" /> + width="70" /> <button follows="bottom|left" font="SansSerifSmall" @@ -110,7 +99,7 @@ background_visible="true" left_pad="5" name="edit_btn" top="0" - width="50" /> + width="70" /> <button follows="bottom|right" font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml index 75d20c1ce3..d9f39b6937 100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -22,8 +22,8 @@ bottom="0" tab_stop="false" is_toggle="true" - image_selected="ComboButton_Selected" - image_unselected="ComboButton_Off" + image_selected="ComboButton_UpSelected" + image_unselected="ComboButton_UpOff" /> <monitor name="monitor" |