diff options
Diffstat (limited to 'indra/newview/skins')
41 files changed, 398 insertions, 197 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 6da38fa0d4..e248047930 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -57,8 +57,11 @@ name="Black_50" value="0 0 0 0.5" /> <color + name="FrogGreen" + value="0.26 0.345 0.263 1" /> + <color name="Red" - value="1 0 0 1" /> + value="0.729 0 0.121 1" /> <color name="Blue" value="0 0 1 1" /> @@ -71,16 +74,19 @@ <color name="Transparent" value="0 0 0 0" /> + <color + name="Purple" + value="1 0 1 1" /> <!-- This color name makes potentially unused colors show up bright purple. Leave this here until all Unused? are removed below, otherwise the viewer generates many warnings on startup. --> <color name="Unused?" - value="1 0 1 1" /> + value=".831 1 0 1" /> <!-- UI Definitions --> - <color + <color name="AgentChatColor" reference="White" /> <color @@ -169,13 +175,13 @@ reference="LtGray" /> <color name="ChicletFlashColor" - reference="0.114 0.65 0.1" /> + value="0.114 0.65 0.1" /> <color name="ColorDropShadow" reference="Black_50" /> <color name="ColorPaletteEntry01" - value="0 0 0 1" /> + reference="Black" /> <color name="ColorPaletteEntry02" value="0.5 0.5 0.5 1" /> @@ -217,34 +223,34 @@ value="0.5 0.25 0 1" /> <color name="ColorPaletteEntry15" - value="1 1 1 1" /> + reference="White" /> <color name="ColorPaletteEntry16" - value="1 1 1 1" /> + reference="White" /> <color name="ColorPaletteEntry17" - value="1 1 1 1" /> + reference="White" /> <color name="ColorPaletteEntry18" - value="0.75 0.75 0.75 1" /> + reference="LtGray" /> <color name="ColorPaletteEntry19" - value="1 0 0 1" /> + reference="Red" /> <color name="ColorPaletteEntry20" reference=".5 .5 1 0" /> <color name="ColorPaletteEntry21" - value="0 1 0 1" /> + reference="Green" /> <color name="ColorPaletteEntry22" value="0 1 1 1" /> <color name="ColorPaletteEntry23" - value="0 0 1 1" /> + reference="Blue" /> <color name="ColorPaletteEntry24" - value="1 0 1 1" /> + reference="Purple" /> <color name="ColorPaletteEntry25" value="1 1 0.5 1" /> @@ -265,10 +271,10 @@ value="1 0.5 0 1" /> <color name="ColorPaletteEntry31" - value="1 1 1 1" /> + reference="White" /> <color name="ColorPaletteEntry32" - value="1 1 1 1" /> + reference="White" /> <color name="ConsoleBackground" reference="Black" /> @@ -325,7 +331,7 @@ value="0.92 0.92 1 0.78" /> <color name="GridlineColor" - value="1 0 0 1" /> + reference="Red" /> <color name="GridlineShadowColor" value="0 0 0 0.31" /> @@ -337,10 +343,10 @@ value="0.3344 0.5456 0.5159 1" /> <color name="GroupNotifyTextColor" - reference="White"/> + reference="White"/> <color name="GroupNotifyDimmedTextColor" - reference="DkGray"/> + reference="DkGray" /> <color name="GroupOverTierColor" value="0.43 0.06 0.06 1" /> @@ -397,7 +403,7 @@ reference="DkGray2" /> <color name="InventoryFocusOutlineColor" - reference="EmphasisColor" /> + reference="White_25" /> <color name="InventoryItemSuffixColor" reference="White_25" /> @@ -460,7 +466,7 @@ reference="DkGray" /> <color name="MenuBarGodBgColor" - reference="Green" /> + reference="FrogGreen" /> <color name="MenuDefaultBgColor" reference="DkGray2" /> @@ -481,7 +487,7 @@ reference="Black" /> <color name="MenuNonProductionGodBgColor" - value="0 0.5 0 1" /> + value="0.263 0.325 0.345 1" /> <color name="MenuPopupBgColor" reference="DkGray2" /> @@ -508,7 +514,7 @@ value="0 0 0 0.3" /> <color name="NetMapGroupOwnAboveWater" - value="1 0 1 1" /> + reference="Purple" /> <color name="NetMapGroupOwnBelowWater" value="0.78 0 0.78 1" /> @@ -541,7 +547,7 @@ reference="EmphasisColor" /> <color name="OverdrivenColor" - value="1 0 0 1" /> + reference="Red" /> <color name="PanelDefaultBackgroundColor" reference="DkGray" /> @@ -640,10 +646,10 @@ reference="Unused?" /> <color name="SpeakingColor" - value="0 1 0 1" /> + reference="FrogGreen" /> <color name="SystemChatColor" - reference="White" /> + reference="White" /> <color name="TextBgFocusColor" reference="White" /> @@ -658,7 +664,7 @@ reference="Black" /> <color name="TextDefaultColor" - value="Black" /> + reference="Black" /> <color name="TextEmbeddedItemColor" value="0 0 0.5 1" /> @@ -709,7 +715,7 @@ <color name="SysWellItemSelected" value="0.3 0.3 0.3 1.0" /> - <color + <color name="ChatToastAgentNameColor" reference="EmphasisColor" /> <color diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 2d519858db..60c1470b89 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -591,15 +591,15 @@ with the same filename but different name <texture name="Tool_Zoom" file_name="build/Tool_Zoom.png" preload="false" /> <texture name="Toolbar_Divider" file_name="containers/Toolbar_Divider.png" preload="false" /> - <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" /> - <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" /> - <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="false" /> - <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="false" /> - <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="false" /> - <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="false" /> - <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" /> - <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" /> - <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" /> + <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> + <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> + <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> <texture name="Tooltip" file_name="widgets/Tooltip.png" preload="true" scale.left="2" scale.top="16" scale.right="100" scale.bottom="3" /> @@ -665,10 +665,15 @@ with the same filename but different name <texture name="icn_voice-groupfocus.tga" /> <texture name="icn_voice-pvtfocus.tga" /> - <texture name="jump_left_out.tga" /> - <texture name="jump_left_in.tga" /> - <texture name="jump_right_out.tga" /> - <texture name="jump_right_in.tga" /> + <texture name="jump_left_out.tga" file_name="widgets/jump_left_out.png" /> + <texture name="jump_left_in.tga" file_name="widgets/jump_left_in.png" /> + <texture name="jump_right_out.tga" file_name="widgets/jump_right_out.png" /> + <texture name="jump_right_in.tga" file_name="widgets/jump_right_in.png" /> + + <texture name="scrollbutton_left_out_blue.tga" file_name="widgets/ScrollArrow_Left_Opaque.png" /> + <texture name="scrollbutton_left_in_blue.tga" file_name="widgets/ScrollArrow_Left_Over_Opaque.png" /> + <texture name="scrollbutton_right_out_blue.tga" file_name="widgets/ScrollArrow_Right_Opaque.png" /> + <texture name="scrollbutton_right_in_blue.tga" file_name="widgets/ScrollArrow_Right_Over_Opaque.png" /> <texture name="up_arrow.tga" file_name="up_arrow.png" /> <texture name="down_arrow.tga" file_name="down_arrow.png" /> @@ -690,7 +695,7 @@ with the same filename but different name <texture name="button_anim_play.tga" /> <texture name="button_anim_play_selected.tga" /> <texture name="crosshairs.tga" /> - <texture name="direction_arrow.tga" /> + <texture name="direction_arrow.tga" file_name="world/BeaconArrow.png" /> <texture name="icon_auction.tga" /> <texture name="icon_avatar_offline.tga" /> diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png Binary files differnew file mode 100644 index 0000000000..549b3980f6 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png Binary files differnew file mode 100644 index 0000000000..a74abd5d8a --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png Binary files differnew file mode 100644 index 0000000000..36056d0ad9 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png Binary files differnew file mode 100644 index 0000000000..0c1fd6956b --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png diff --git a/indra/newview/skins/default/textures/widgets/jump_left_in.png b/indra/newview/skins/default/textures/widgets/jump_left_in.png Binary files differnew file mode 100644 index 0000000000..a1425ccfa0 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/jump_left_in.png diff --git a/indra/newview/skins/default/textures/widgets/jump_left_out.png b/indra/newview/skins/default/textures/widgets/jump_left_out.png Binary files differnew file mode 100644 index 0000000000..38edf47d19 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/jump_left_out.png diff --git a/indra/newview/skins/default/textures/widgets/jump_right_in.png b/indra/newview/skins/default/textures/widgets/jump_right_in.png Binary files differnew file mode 100644 index 0000000000..39359ab2e2 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/jump_right_in.png diff --git a/indra/newview/skins/default/textures/widgets/jump_right_out.png b/indra/newview/skins/default/textures/widgets/jump_right_out.png Binary files differnew file mode 100644 index 0000000000..3f76bbffac --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/jump_right_out.png diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png Binary files differnew file mode 100644 index 0000000000..12dc246d51 --- /dev/null +++ b/indra/newview/skins/default/textures/world/BeaconArrow.png diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml index 48c67a3770..632564d793 100644 --- a/indra/newview/skins/default/xui/en/alert_button.xml +++ b/indra/newview/skins/default/xui/en/alert_button.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <button + name="Alert Button" label_shadow="true" auto_resize="false" image_overlay_alignment="center" diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 900f4c5956..c58c1f00b9 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -209,7 +209,7 @@ </text> <button follows="right" - height="16" + height="23" image_pressed="Info_Press" image_unselected="Info_Over" left_pad="3" @@ -218,7 +218,7 @@ width="16" /> <!-- <button follows="left|top" - height="16" + height="23" label="Profile" layout="topleft" left_pad="4" @@ -248,7 +248,7 @@ Leyla Linden </text> <button follows="right" - height="16" + height="23" image_pressed="Info_Press" image_unselected="Info_Over" left_pad="3" @@ -263,10 +263,11 @@ Leyla Linden </text> left_pad="4" right="-10" name="Set..." - width="50" /> + width="50" + top_delta="-2"/> <check_box enabled="false" - height="23" + height="16" label="Allow Deed to Group" layout="topleft" left="108" @@ -284,7 +285,7 @@ Leyla Linden </text> right="-10" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group." - top_delta="0" + top_delta="-2" width="90" /> <check_box enabled="false" @@ -294,7 +295,8 @@ Leyla Linden </text> left="108" name="check contrib" tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it." - width="199" /> + width="199" + top_pad="0"/> <text type="string" length="1" @@ -335,7 +337,7 @@ Leyla Linden </text> layout="topleft" left_delta="0" name="SalePending" - top_pad="6" + top_pad="5" width="324" /> <button follows="left|top" @@ -345,7 +347,8 @@ Leyla Linden </text> left_pad="5" right="-10" name="Sell Land..." - width="145" /> + width="145" + top_delta="-25"/> <text type="string" length="1" @@ -354,7 +357,7 @@ Leyla Linden </text> layout="topleft" left_delta="-199" name="For sale to" - top_delta="2" + top_delta="20" width="186"> For sale to: [BUYER] </text> @@ -366,7 +369,7 @@ Leyla Linden </text> layout="topleft" left_delta="0" name="Sell with landowners objects in parcel." - top_pad="0" + top_pad="-3" width="186"> Objects included in sale </text> @@ -391,7 +394,7 @@ Leyla Linden </text> right="-10" name="Cancel Land Sale" left_pad="5" - top_pad="-10" + top_pad="-25" width="145" /> <text type="string" @@ -522,7 +525,7 @@ Leyla Linden </text> layout="topleft" left_delta="0" name="Reclaim Land..." - top_delta="-48" + top_delta="-61" width="180" /> <button enabled="false" @@ -810,7 +813,7 @@ Leyla Linden </text> follows="left|top" height="16" layout="topleft" - left_delta="152" + left_delta="190" name="objects_available" top_delta="0" width="260"> @@ -834,7 +837,7 @@ Leyla Linden </text> follows="left|top" height="16" layout="topleft" - left_delta="200" + left_delta="190" name="object_contrib_text" top_delta="0" width="212"> @@ -858,7 +861,7 @@ Leyla Linden </text> follows="left|top" height="16" layout="topleft" - left_delta="200" + left_delta="190" name="total_objects_text" top_delta="0" width="48"> @@ -868,7 +871,7 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Owned by parcel owner:" @@ -880,9 +883,9 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="176" + left_delta="172" name="owner_objects_text" top_delta="0" width="48"> @@ -892,33 +895,35 @@ Leyla Linden </text> bottom="100" enabled="false" follows="left|top" - height="20" + height="23" label="Show" label_selected="Show" layout="topleft" name="ShowOwner" right="-140" - width="60" /> + width="60" + top_delta="-6"/> <button bottom="100" enabled="false" follows="left|top" - height="20" + height="23" label="Return" layout="topleft" name="ReturnOwner..." right="-10" tool_tip="Return objects to their owners." - width="119" /> + width="119" + top_delta="0"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Set to group:" - top="104" + top_pad="5" width="176"> Set to group: </text> @@ -926,9 +931,9 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="176" + left_delta="172" name="group_objects_text" top_delta="0" width="48"> @@ -939,32 +944,34 @@ Leyla Linden </text> enabled="false" follows="left|top" label="Show" - height="20" + height="23" label_selected="Show" layout="topleft" name="ShowGroup" right="-140" - width="60" /> + width="60" + top_delta="-6"/> <button bottom="120" enabled="false" follows="left|top" - height="20" + height="23" label="Return" layout="topleft" name="ReturnGroup..." right="-10" tool_tip="Return objects to their owners." - width="119" /> + width="119" + top_delta="0"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Owned by others:" - top="124" + top_pad="5" width="176"> Owned by others: </text> @@ -972,9 +979,9 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="176" + left_delta="172" name="other_objects_text" top_delta="0" width="48"> @@ -984,33 +991,35 @@ Leyla Linden </text> bottom="140" enabled="false" follows="left|top" - height="20" + height="23" label="Show" label_selected="Show" layout="topleft" name="ShowOther" right="-140" - width="60" /> + width="60" + top_delta="-6"/> <button bottom="140" enabled="false" follows="left|top" - height="20" + height="23" label="Return" layout="topleft" name="ReturnOther..." right="-10" tool_tip="Return objects to their owners." - width="119" /> + width="119" + top_delta="0"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="28" name="Selected / sat upon:" - top="144" + top_pad="5" width="176"> Selected / sat upon: </text> @@ -1018,9 +1027,9 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" - left_delta="176" + left_delta="172" name="selected_objects_text" top_delta="0" width="48"> @@ -1030,51 +1039,53 @@ Leyla Linden </text> type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="10" name="Autoreturn" - top="164" + top_pad="0" width="294"> - Autoreturn other Residents' objects (minutes, 0 for off): + Auto return other Residents' objects (minutes, 0 for off): </text> <line_editor border_style="line" border_thickness="1" bottom="180" follows="left|top" - height="16" + height="23" layout="topleft" max_length="6" name="clean other time" - right="-50" - width="56" /> + right="-72" + width="56" + top_delta="-6"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="10" name="Object Owners:" - top="184" + top_pad="10" width="104"> Object Owners: </text> <button follows="top|right" - height="20" + height="23" image_overlay="Refresh_Off" layout="topleft" name="Refresh List" left_pad="5" right="-183" tool_tip="Refresh Object List" - width="20" /> + width="20" + top_delta="-6"/> <button enabled="false" follows="left|top" - height="20" + height="23" label="Return Objects" layout="topleft" left_pad="6" @@ -1086,7 +1097,7 @@ Leyla Linden </text> column_padding="0" draw_heading="true" follows="all" - height="190" + height="180" layout="topleft" left="10" name="owner list" @@ -1313,7 +1324,7 @@ Only large parcels can be listed in search. width="430" /> <combo_box enabled="false" - height="20" + height="23" layout="topleft" left="30" name="land category with adult" @@ -1374,7 +1385,7 @@ Only large parcels can be listed in search. </combo_box> <combo_box enabled="false" - height="20" + height="23" layout="topleft" left="30" name="land category" @@ -1463,7 +1474,7 @@ Only large parcels can be listed in search. type="string" length="1" follows="left|top" - height="30" + height="16" layout="topleft" left="220" top="180" @@ -1553,12 +1564,13 @@ Only large parcels can be listed in search. Type: </text> <combo_box - height="20" + height="23" layout="topleft" left_pad="0" name="media type" tool_tip="Specify if the URL is a movie, web page, or other media" - width="120" /> + width="120" + top_delta="0"/> <text follows="left|top" height="16" @@ -1574,27 +1586,29 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="at URL:" - width="100"> + width="100" + top_pad="10"> Home Page: </text> <line_editor follows="left|top" - height="20" + height="23" layout="topleft" left_pad="0" max_length="255" name="media_url" select_on_focus="true" - width="300" /> + width="300" + top_delta="0"/> <button follows="right|top" - height="22" + height="23" label="Set" layout="topleft" left_pad="5" - right="-10" name="set_media_url" - width="50" /> + width="50" + top_delta="0"/> <text type="string" length="1" @@ -1603,18 +1617,20 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="CurrentURL:" - width="100"> + width="100" + top_pad="10"> Current Page: </text> - <button - follows="top|right" - height="20" - image_overlay="Refresh_Off" - layout="topleft" + <button + follows="top|right" + height="23" + image_overlay="Refresh_Off" + layout="topleft" name="reset_media_url" - left_pad="0" - tool_tip="Refresh URL" - width="20" /> + left_pad="0" + tool_tip="Refresh URL" + width="23" + top_delta="0"/> <text follows="left|top" height="16" @@ -1623,22 +1639,25 @@ Only large parcels can be listed in search. name="current_url" width="300" /> <check_box + follows="top|left" height="16" label="Hide URL" layout="topleft" - left="110" + left_delta="-36" name="hide_media_url" tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types." - width="200" /> + width="50" + top_pad="5"/> <text type="string" length="1" follows="left|top" - height="16" + height="23" layout="topleft" left="10" name="Description:" - width="364"> + width="364" + top_pad="10"> Description: </text> <line_editor @@ -1650,7 +1669,7 @@ Only large parcels can be listed in search. name="url_description" select_on_focus="true" tool_tip="Text displayed next to play/load button" - top_delta="10" + top_delta="0" width="300" /> <text type="string" @@ -1674,7 +1693,7 @@ Only large parcels can be listed in search. left="110" name="media texture" tool_tip="Click to choose a picture" - top_delta="10" + top_delta="0" width="64" /> <text type="string" @@ -1685,16 +1704,17 @@ Only large parcels can be listed in search. left_pad="8" name="replace_texture_help" width="300" - word_wrap="true"> + word_wrap="true" + top_delta="0"> Objects using this texture will show the movie or web page after you click the play arrow. Select the thumbnail to choose a different texture. </text> <check_box height="16" label="Auto scale" layout="topleft" - left="110" + left="107" name="media_auto_scale" - top_pad="0" + top_pad="-10" tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required." width="200" /> <text @@ -1706,7 +1726,8 @@ Only large parcels can be listed in search. left="10" name="media_size" tool_tip="Size to render Web media, leave 0 for default." - width="100"> + width="100" + top_pad="10"> Size: </text> <spinner @@ -1714,7 +1735,7 @@ Only large parcels can be listed in search. enabled="false" follows="left|top" halign="right" - height="20" + height="23" increment="1" initial_value="0" layout="topleft" @@ -1729,7 +1750,7 @@ Only large parcels can be listed in search. enabled="false" follows="left|top" halign="right" - height="20" + height="23" increment="1" initial_value="0" layout="topleft" @@ -1759,7 +1780,7 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="Options:" - top_pad="8" + top_pad="10" width="100"> Options: </text> @@ -1767,10 +1788,10 @@ Only large parcels can be listed in search. height="16" label="Loop" layout="topleft" - left_pad="0" + left_pad="-3" name="media_loop" tool_tip="Play media in a loop. When the media has finished playing, it will restart from the beginning." - top_delta="0" + top_delta="-1" width="200" /> </panel> <panel @@ -1796,12 +1817,12 @@ Only large parcels can be listed in search. </text> <line_editor follows="left|top" - height="20" + height="23" layout="topleft" left="100" max_length="255" name="music_url" - top_pad="0" + top_delta="0" right="-15" select_on_focus="true" /> <text @@ -1941,7 +1962,7 @@ Only large parcels can be listed in search. width="278" /> <check_box enabled="false" - height="22" + height="16" label="Sell passes to:" layout="topleft" left_delta="0" @@ -1950,7 +1971,7 @@ Only large parcels can be listed in search. top_pad="4" width="120" /> <combo_box - height="20" + height="23" layout="topleft" left_pad="22" name="pass_combo" @@ -1968,7 +1989,7 @@ Only large parcels can be listed in search. <spinner enabled="false" follows="left|top" - height="22" + height="23" increment="1" initial_value="10" label="Price in L$:" @@ -1983,7 +2004,7 @@ Only large parcels can be listed in search. <spinner enabled="false" follows="left|top" - height="22" + height="23" increment="0.25" initial_value="1" label="Hours of access:" diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index ccbba61ddf..d97ca554b7 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -19,6 +19,7 @@ name="im_box_tab_container"
tab_position="bottom"
tab_width="80"
+ tab_height="16"
top="0"
width="390" />
<icon
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml new file mode 100644 index 0000000000..c3d84de9a7 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + legacy_header_height="18" + border="true" + can_close="false" + can_minimize="false" + height="100" + layout="topleft" + name="modal container" + width="240"> + <button + height="20" + label="Save" + label_selected="Save" + layout="topleft" + left="20" + name="Save" + top="70" + width="82" /> + <button + height="20" + label="Cancel" + label_selected="Cancel" + layout="topleft" + left_pad="36" + name="Cancel" + top_delta="0" + width="82" /> + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="20" + name="Save item as:" + top="10" + width="200"> + Save outfit as: + </text> + <line_editor + type="string" + length="1" + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + handle_edit_keys_directly="true" + height="20" + layout="topleft" + left_delta="0" + max_length="63" + name="name ed" + top_pad="4" + width="200"> + [DESC] + </line_editor> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index f44ba6d873..c3e974d978 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -7,7 +7,6 @@ layout="topleft" left="0" name="script_floater" - help_topic="script_floater" top="0" can_dock="true" can_minimize="true" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index a36a1b591b..60c9810e95 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -43,6 +43,12 @@ layout="topleft" name="local" /> </radio_group> + <ui_ctrl + height="90" + width="90" + name="thumbnail_placeholder" + top_pad="6" + /> <text type="string" font="SansSerifSmall" @@ -54,7 +60,7 @@ left_delta="0" halign="right" name="file_size_label" - top_pad="106" + top_pad="10" width="195"> [SIZE] KB </text> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e20e5a85c0..1ec004b194 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -811,6 +811,7 @@ Please select a proposal to view. Please select a history item to view. </notification> +<!-- <notification icon="alertmodal.tga" name="ResetShowNextTimeDialogs" @@ -832,6 +833,7 @@ Would you like to disable all popups which can be skipped? notext="Cancel" yestext="OK"/> </notification> +--> <notification icon="alertmodal.tga" @@ -1400,6 +1402,16 @@ You have added "[LANDMARK_NAME]" to your [FOLDER_NAME] folder. </notification> <notification + icon="alert.tga" + name="LandmarkAlreadyExists" + type="alert"> +You already have a landmark for this location. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" name="CannotCreateLandmarkNotOwner" type="alertmodal"> @@ -5368,6 +5380,7 @@ Grant this request? </form> </notification> +<!-- <notification icon="notify.tga" name="FirstBalanceIncrease" @@ -5383,6 +5396,7 @@ Your L$ balance is shown in the upper-right. You just paid L$[AMOUNT]. Your L$ balance is shown in the upper-right. </notification> +--> <notification icon="notify.tga" @@ -5394,6 +5408,8 @@ Your L$ balance will be updated when processing completes. If processing takes m The status of your payment can be checked on your Transaction History page on your [http://secondlife.com/account/ Dashboard] </notification> + +<!-- <notification icon="notify.tga" name="FirstSit" @@ -5418,8 +5434,9 @@ Use the controls on the right to find things and display different backgrounds. type="notify"> You have opened the Build Tools. Every object you see around you was created using these tools. </notification> +--> -<!-- +<!-- <notification icon="notify.tga" name="FirstLeftClickNoHit" @@ -5428,7 +5445,7 @@ You have opened the Build Tools. Every object you see around you was created usi If the mouse pointer changes to a hand, you can interact with the object. Right-click always shows a menu of things you can do. </notification> ---> + <notification icon="notify.tga" name="FirstTeleport" @@ -5436,6 +5453,8 @@ You have opened the Build Tools. Every object you see around you was created usi You can only teleport to certain areas in this region. The arrow points to your specific destination. Click the arrow to dismiss it. </notification> +--> + <notification icon="notify.tga" name="FirstOverrideKeys" @@ -5446,6 +5465,7 @@ Some objects (like guns) require you to go into mouselook to use them. Press 'M' to do this. </notification> +<!-- <notification icon="notify.tga" name="FirstAppearance" @@ -5465,6 +5485,7 @@ This is your Inventory, which contains items you own. * To rez something inworld, drag it onto the ground. * To read a notecard, double-click it. </notification> +--> <notification icon="notify.tga" @@ -5475,6 +5496,7 @@ This is a sandbox area, and is meant to help Residents learn how to build. Things you build here will be deleted after you leave, so don't forget to right-click and choose 'Take' to move your creation to your Inventory. </notification> +<!-- <notification icon="notify.tga" name="FirstFlexible" @@ -5500,13 +5522,16 @@ To toggle this menu, type="notify"> You are editing a Sculpted prim. Sculpties require a special texture to define their shape. </notification> +--> - <!--notification + <!-- + <notification icon="notify.tga" name="FirstMedia" type="notify"> You have begun playing media. Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust. - </notification--> + </notification> + --> <notification icon="notifytip.tga" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 4b39210f30..de3de45718 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -382,6 +382,17 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well width="40" min_width="40" user_resize="false"> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="4" + top="0" + width="5" /> <chiclet_notification flash_period="0.25" follows="right" @@ -414,6 +425,17 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well function="Button.SetDockableFloaterToggle" parameter="notification_well_window" /> </button> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="4" + top="0" + width="5" /> </chiclet_notification> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml index d0a2ddb289..357dbc07cc 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_separator.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml @@ -3,6 +3,6 @@ background_visible="true" bg_alpha_color="black" follows="left|right|top" - height="1" + height="0" layout="topleft" name="chat_separator_panel" /> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index 5c594d3f14..677bdbc3d2 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -7,6 +7,7 @@ left="0" min_height="350" name="panel_classified_info" + help_topic="profile_classified_info" top="0" width="333"> <panel.string diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 1fbf7abda9..188ded3dab 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -9,6 +9,7 @@ left="0" min_height="350" name="panel_edit_classified" + help_topic="profile_edit_classified" top="0" width="333"> <panel.string diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 7769189219..15eff4b67c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -9,6 +9,7 @@ left="0" min_height="350" name="panel_edit_pick" + help_topic="profile_edit_pick" top="0" width="333"> <button diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 9d00abd2c9..4030c7184a 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -41,6 +41,7 @@ halign="center" follows="all" height="295" label="MY INVENTORY" + help_topic="my_inventory_tab" layout="topleft" left="0" name="All Items" @@ -51,6 +52,7 @@ halign="center" follows="all" height="295" label="RECENT" + help_topic="recent_inventory_tab" layout="topleft" left_delta="0" name="Recent Items" diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 9c7f38e688..822e049eec 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -7,6 +7,7 @@ left="0" min_height="350" name="panel_pick_info" + help_topic="profile_pick_info" top="0" width="333"> <button diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 1fc553ff36..a2b0adf9d9 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -124,7 +124,6 @@ height="25" top_pad="10" name="buttons_cucks" - help_topic="picks_button_tab" width="313"> <button enabled="false" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml index 18d0f8acab..ace8281b4e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml @@ -31,7 +31,6 @@ width="300" /> <check_box control_name="ChatOnlineNotification" - enabled="false" height="16" label="When my friends log out or in" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 1c1e17eb5a..a8e24366f2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -77,10 +77,23 @@ name="cookies_enabled" top_pad="10" width="350" /> - <check_box + <check_box + control_name="MediaEnabled" + height="16" + label="Media Enabled" + layout="topleft" + left="30" + name="media_enabled" + top_pad="10" + width="350"> + <check_box.commit_callback + function="Pref.MediaEnabled" /> + </check_box> + <check_box + enabled_control="MediaEnabled" control_name="ParcelMediaAutoPlayEnable" height="16" - label="Allow Media Autoplay" + label="Allow Media to auto-play" layout="topleft" left="30" name="autoplay_enabled" diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index ab6384203f..e1d8ee241d 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -122,6 +122,7 @@ height="22" width="22"> <button + name="fwd_btn" follows="top" image_overlay="Arrow_Right_Off" image_disabled="PushButton_Disabled" @@ -131,7 +132,6 @@ hover_glow_amount="0.15" top="0" height="22" - min_width="22" width="22" layout="topleft" tool_tip="Navigate forward"> @@ -150,10 +150,11 @@ min_width="22" width="22"> <button + name="home_btn" follows="top" + image_overlay="Home_Off" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Disabled" - image_overlay="Home_Off" image_selected="PushButton_Selected" image_unselected="PushButton_Off" hover_glow_amount="0.15" @@ -161,7 +162,6 @@ tool_tip="Home page" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Home" /> @@ -178,6 +178,7 @@ min_width="22" width="22"> <button + name="media_stop_btn" follows="top" image_overlay="Stop_Off" image_disabled="PushButton_Disabled" @@ -189,7 +190,6 @@ tool_tip="Stop media" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.MediaStop" /> @@ -206,6 +206,7 @@ min_width="22" width="22"> <button + name="reload_btn" follows="top" image_overlay="Refresh_Off" image_disabled="PushButton_Disabled" @@ -217,7 +218,6 @@ tool_tip="Reload" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Reload" /> @@ -234,6 +234,7 @@ min_width="22" width="22"> <button + name="stop_btn" follows="top" image_overlay="StopReload_Off" image_disabled="PushButton_Disabled" @@ -245,7 +246,6 @@ tool_tip = "Stop loading" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Stop" /> @@ -262,6 +262,7 @@ min_width="22" width="24"> <button + name="play_btn" follows="top" image_overlay="Play_Off" image_disabled="PushButton_Disabled" @@ -274,7 +275,6 @@ left_delta="2" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Play" /> @@ -290,6 +290,7 @@ min_width="22" width="24"> <button + name="pause_btn" follows="top" image_overlay="Pause_Off" image_disabled="PushButton_Disabled" @@ -354,7 +355,6 @@ image_name="Flag" layout="topleft" tool_tip="White List enabled" - min_width="16" width="16" /> </layout_panel> <layout_panel @@ -369,7 +369,6 @@ image_name="Lock2" layout="topleft" tool_tip="Secured Browsing" - min_width="16" width="16" /> </layout_panel> </layout_stack> @@ -394,7 +393,6 @@ initial_value="0.5" layout="topleft" tool_tip="Movie play progress" - min_width="100" width="200"> <slider_bar.commit_callback function="MediaCtrl.JumpProgress" /> @@ -410,6 +408,7 @@ min_width="22" width="22"> <button + name="skip_back_btn" follows="top" image_overlay="SkipBackward_Off" image_disabled="PushButton_Disabled" @@ -438,6 +437,7 @@ min_width="22" width="22"> <button + name="skip_forward_btn" follows="top" image_overlay="SkipForward_Off" image_disabled="PushButton_Disabled" @@ -449,7 +449,6 @@ layout="topleft" tool_tip="Step forward" top="0" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.SkipForward" /> @@ -470,20 +469,19 @@ <!-- two different images. --> <!-- Note also: the button and the slider must overlap! --> <button + name="media_mute_button" follows="top" image_disabled="PushButton_Disabled" image_disabled_selected="PushButton_Disabled" image_selected="AudioMute_Off" image_unselected="Audio_Off" hover_glow_amount="0.15" - name="media_mute_button" is_toggle="true" layout="topleft" scale_image="false" tool_tip="Mute This Media" top="0" height="20" - min_width="22" width="22" > <button.commit_callback function="MediaCtrl.ToggleMute" /> @@ -523,6 +521,7 @@ min_width="22" width="22"> <button + name="zoom_frame_btn" follows="top" image_overlay="Zoom_Off" image_disabled="PushButton_Disabled" @@ -534,7 +533,6 @@ height="22" layout="topleft" tool_tip="Zoom into media" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Zoom" /> @@ -550,6 +548,7 @@ min_width="21" width="21" > <button + name="close_btn" follows="top" image_overlay="UnZoom_Off" image_disabled="PushButton_Disabled" @@ -577,6 +576,7 @@ min_width="22" width="22"> <button + name="new_window_btn" follows="top" image_overlay="ExternalBrowser_Off" image_disabled="PushButton_Disabled" @@ -588,7 +588,6 @@ layout="topleft" tool_tip = "Open URL in browser" top="0" - min_width="24" width="24" > <button.commit_callback function="MediaCtrl.Open" /> 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 1dd4eb095c..ab3cc036d5 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 @@ -4,7 +4,6 @@ follows="all" height="570" min_height="350" - label="home_tab" help_topic="sidetray_home" layout="topleft" top="0" diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index ba2d61afb7..d198237e5d 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -39,7 +39,8 @@ name="toast_text" word_wrap="true" text_color="white" - top="5" + top="5" + v_pad="5" use_ellipses="true" width="260"> Toast text; diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 51974be854..fb5f9d2ec8 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -33,7 +33,6 @@ <panel height="25" layout="bottomright" - help_topic="item_button_tab" name="button_panel" left="5" bottom="5" diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 4a992dadd9..e18f59ab64 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -401,7 +401,6 @@ top_pad="10" <panel height="30" layout="bottomright" - help_topic="button_tab" name="button_panel" left="5" bottom="2" @@ -414,4 +413,4 @@ top_pad="10" right="-1" width="100" /> </panel> - </panel>
\ No newline at end of file + </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 2dfcdf4a4c..74f97dca4e 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -518,7 +518,6 @@ <panel height="25" layout="bottomright" - help_topic="button_tab" name="button_panel" left="5" bottom="5" @@ -551,4 +550,4 @@ top="0" width="100" /> </panel> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index 8785dff2ae..ef885e8045 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -1,23 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <chat_history - message_header="panel_chat_header.xml" - message_separator="panel_chat_separator.xml" - left_text_pad="10" - right_text_pad="15" - left_widget_pad="0" - right_widget_pad="10" - top_separator_pad="5" - bottom_separator_pad="5" - top_header_pad="17" - bottom_header_pad="10" + message_header="panel_chat_header.xml" + message_separator="panel_chat_separator.xml" + left_text_pad="10" + right_text_pad="15" + left_widget_pad="0" + right_widget_pad="10" + top_separator_pad="1" + bottom_separator_pad="1" + top_header_pad="12" + bottom_header_pad="5" max_length="2147483647" track_bottom="true" name="chat_history" type="string" word_wrap="true" + line_spacing.multiple="1.0" font="SansSerif"> <more_chat_text mouse_opaque="true" word_wrap="true" /> -</chat_history> +</chat_history>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index 693c43f141..2bec5b8a29 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -4,6 +4,13 @@ name="im_adhoc_chiclet" show_speaker="false" width="25"> + <chiclet_im_adhoc.chiclet_button + height="25" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> <chiclet_im_adhoc.speaker auto_update="true" draw_border="false" @@ -13,11 +20,13 @@ visible="false" width="20" /> <chiclet_im_adhoc.avatar_icon + bottom="3" follows="left|top|bottom" - height="22" + height="19" + left="3" mouse_opaque="true" name="adhoc_icon" - width="22" /> + width="19" /> <chiclet_im_adhoc.unread_notifications font_halign="center" height="25" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml index f4fc58701c..1d7f3208af 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml @@ -4,6 +4,13 @@ name="im_group_chiclet" show_speaker="false" width="25"> + <chiclet_im_group.chiclet_button + height="25" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> <chiclet_im_group.speaker auto_update="true" draw_border="false" @@ -13,13 +20,14 @@ visible="false" width="20" /> <chiclet_im_group.group_icon + bottom="3" default_icon="Generic_Group" follows="left|top|bottom" - height="18" - bottom_pad="4" - mouse_opaque="true" + height="19" + left="3" + mouse_opaque="false" name="group_icon" - width="18" /> + width="19" /> <chiclet_im_group.unread_notifications height="25" font_halign="center" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml index 535113f717..e6289f7cef 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml @@ -4,6 +4,13 @@ name="im_p2p_chiclet" show_speaker="false" width="25"> + <chiclet_im_p2p.chiclet_button + height="25" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> <chiclet_im_p2p.speaker auto_update="true" draw_border="false" @@ -13,11 +20,13 @@ visible="false" width="20"/> <chiclet_im_p2p.avatar_icon + bottom="3" follows="left|top|bottom" - height="22" - mouse_opaque="true" + height="19" + left="3" + mouse_opaque="false" name="avatar_icon" - width="22" /> + width="19" /> <chiclet_im_p2p.unread_notifications height="25" font_halign="center" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml index 86bea9be50..138b50c968 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml @@ -3,14 +3,22 @@ height="25" name="offer_chiclet" width="25"> + <chiclet_offer.chiclet_button + height="25" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> <chiclet_offer.icon + bottom="3" default_icon="Generic_Object_Small" follows="all" - height="20" + height="19" + left="3" mouse_opaque="false" name="chiclet_icon" - bottom_pad="2" - width="20" /> + width="19" /> <chiclet_offer.new_message_icon bottom="11" height="14" diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index b1f9f5b0e8..ecf149dc76 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -3,14 +3,22 @@ height="25" name="script_chiclet" width="25"> + <chiclet_script.chiclet_button + height="25" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + name="chiclet_button" + tab_stop="false" + width="25"/> <chiclet_script.icon + bottom="3" follows="all" - height="20" + height="19" image_name="Generic_Object_Small" + left="3" mouse_opaque="false" name="chiclet_icon" - width="20" - bottom_pad="2" /> + width="19"/> <chiclet_script.new_message_icon bottom="11" height="14" diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml index 53034afa61..58543338f6 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu bg_color="MenuDefaultBgColor" bg_visible="true" - drop_shadow="false" + drop_shadow="true" tear_off="false" shortcut_pad="15"> </menu> |
