diff options
Diffstat (limited to 'indra/newview/skins')
6 files changed, 157 insertions, 127 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 1e47701e35..f4a239be62 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,3 +1,33 @@ +<!-- +This file contains metadata about how to load, display, and scale textures for rendering in the UI. +Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer +to them by filename (relative to textures directory). +NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry +with the same filename but different name + +<texture + name="MyTexture" (mandatory) + - this is the name you reference the texture by in XUI. For example, <button image_unselected="MyTexture"/> + file_name="images/my_texture.png" (optional) + - this is the path to the actual file asset, relative to the current skins "textures" directory. + If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case. + NOTE: you need to provide an extension on the filename (".png", ".tga", ".jpg") for us to decode the image properly + preload="true" (optional, false by default) + - If true, we will attempt to load the image before displaying any UI. + If false, we will load in the background after initializing the UI. + use_mips="true" (currently unused) + scale.left="1" + scale.bottom="1" + scale.top="15" + scale.right="31" + - Specifies the segmentation for 9-slice image scaling. Specifically, the pixel offsets from the LOWER LEFT corner + that define the region of the image that is stretched to make the whole image fit in the required space. + In this example, if the source image is 32x16 pixels, we have defined a center region that starts one pixel up + and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left + corner. The end result is that the image will keep a 1 pixel border all around while stretching to fit the required + region. +--> + <textures version="101"> <!-- Please add new files alphabetically to prevent merge conflicts. JC --> <texture name="Accordion_ArrowClosed_Off" file_name="containers/Accordion_ArrowClosed_Off.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index 83570e2528..16f6e49092 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -38,14 +38,14 @@ owner [OWNER] width="220" /> <text follows="all" - height="30" + height="33" left="8" name="object_creator" top_pad="0" use_ellipses="true" width="220"> -by Longavatarname Johnsonlongstonnammer -owner James Linden + by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about +owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about </text> <!-- *TODO: Replace this icon --> <icon @@ -54,7 +54,7 @@ owner James Linden right="-5" width="16" height="16" - top="50" + top="56" follows="left|top" /> <text @@ -66,7 +66,7 @@ owner James Linden left="5" name="price_text" text_color="white" - top="53" + top="58" font_shadow="none" width="196"> L$300,000 diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 56cb54c975..0d1ed6fc64 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5747,7 +5747,7 @@ Are you sure you want to delete your teleport history? name="BottomTrayButtonCanNotBeShown" type="alert"> Selected button can not be shown right now. -The button will be shown when there is enough space for it.
+The button will be shown when there is enough space for it. </notification> diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml index 38294c907a..3ed91cb48f 100644 --- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml +++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml @@ -7,8 +7,8 @@ left="0" height="35" width="318" - background_opaque="false"
- background_visible="true"
+ background_opaque="false" + background_visible="true" bg_alpha_color="0.0 0.0 0.0 0.0" > <chiclet_im_p2p name="p2p_chiclet" diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index 984a799b41..fa7fc34239 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -1,117 +1,117 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- bevel_style="in"
- bg_alpha_color="0 0 0 0"
- height="135"
- label="instant_message"
- layout="topleft"
- left="0"
- name="panel_group_notify"
- top="0"
- width="305">
- <string
- name="message_max_lines_count"
- value="4" />
- <panel
- background_visible="true"
- bevel_style="in"
- bg_alpha_color="black"
- follows="top"
- height="30"
- label="header"
- layout="topleft"
- left="0"
- name="header"
- top="0"
- width="305">
- <icon
- follows="left|top|right|bottom"
- height="20"
- layout="topleft"
- left="5"
- mouse_opaque="true"
- name="group_icon"
- top="5"
- width="20" />
- <text
- follows="left|top|right|bottom"
- font="SansSerifBigBold"
- height="20"
- layout="topleft"
- left_pad="10"
- name="title"
- text_color="GroupNotifyTextColor"
- top="5"
- use_ellipses="true"
- value="Sender Name / Group Name"
- width="230" />
- </panel>
- <text
- follows="top"
- font="SansSerifBig"
- height="20"
- layout="topleft"
- left="25"
- name="subject"
- text_color="GroupNotifyTextColor"
- top="40"
- use_ellipses="true"
- value="subject"
- width="270"
- wrap="true" />
- <text
- follows="top"
- font="SansSerif"
- height="20"
- layout="topleft"
- left="25"
- name="datetime"
- text_color="GroupNotifyTextColor"
- top="80"
- use_ellipses="true"
- value="datetime"
- width="270"
- wrap="true" />
- <text
- follows="left|top|bottom|right"
- height="0"
- layout="topleft"
- left="25"
- name="message"
- text_color="GroupNotifyTextColor"
- top="100"
- use_ellipses="true"
- value="message"
- width="270"
- wrap="true" />
- <icon
- bottom="122"
- follows="left|bottom|right"
- height="15"
- layout="topleft"
- left="25"
- mouse_opaque="true"
- name="attachment_icon"
- width="15" />
- <text
- bottom="122"
- follows="left|bottom|right"
- font="SansSerif"
- height="15"
- layout="topleft"
- left="45"
- name="attachment"
- text_color="GroupNotifyTextColor"
- value="Attachment"
- width="280" />
- <button
- bottom="130"
- follows="bottom"
- height="20"
- label="OK"
- layout="topleft"
- left="25"
- name="btn_ok"
- width="70" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + background_visible="true" + bevel_style="in" + bg_alpha_color="0 0 0 0" + height="135" + label="instant_message" + layout="topleft" + left="0" + name="panel_group_notify" + top="0" + width="305"> + <string + name="message_max_lines_count" + value="4" /> + <panel + background_visible="true" + bevel_style="in" + bg_alpha_color="black" + follows="top" + height="30" + label="header" + layout="topleft" + left="0" + name="header" + top="0" + width="305"> + <icon + follows="left|top|right|bottom" + height="20" + layout="topleft" + left="5" + mouse_opaque="true" + name="group_icon" + top="5" + width="20" /> + <text + follows="left|top|right|bottom" + font="SansSerifBigBold" + height="20" + layout="topleft" + left_pad="10" + name="title" + text_color="GroupNotifyTextColor" + top="5" + use_ellipses="true" + value="Sender Name / Group Name" + width="230" /> + </panel> + <text + follows="top" + font="SansSerifBig" + height="20" + layout="topleft" + left="25" + name="subject" + text_color="GroupNotifyTextColor" + top="40" + use_ellipses="true" + value="subject" + width="270" + wrap="true" /> + <text + follows="top" + font="SansSerif" + height="20" + layout="topleft" + left="25" + name="datetime" + text_color="GroupNotifyTextColor" + top="80" + use_ellipses="true" + value="datetime" + width="270" + wrap="true" /> + <text + follows="left|top|bottom|right" + height="0" + layout="topleft" + left="25" + name="message" + text_color="GroupNotifyTextColor" + top="100" + use_ellipses="true" + value="message" + width="270" + wrap="true" /> + <icon + bottom="122" + follows="left|bottom|right" + height="15" + layout="topleft" + left="25" + mouse_opaque="true" + name="attachment_icon" + width="15" /> + <text + bottom="122" + follows="left|bottom|right" + font="SansSerif" + height="15" + layout="topleft" + left="45" + name="attachment" + text_color="GroupNotifyTextColor" + value="Attachment" + width="280" /> + <button + bottom="130" + follows="bottom" + height="20" + label="OK" + layout="topleft" + left="25" + name="btn_ok" + width="70" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml index 63e60aab78..ccb57b6552 100644 --- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml @@ -10,8 +10,8 @@ height="35" layout="topleft" follows="left|right" - background_opaque="false"
- background_visible="true"
+ background_opaque="false" + background_visible="true" bg_alpha_color="0.0 0.0 0.0 0.0" > <text top="2" |