summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/icons/MinusItem_Disabled.pngbin0 -> 173 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/MinusItem_Off.pngbin0 -> 178 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/MinusItem_Press.pngbin0 -> 172 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml35
-rw-r--r--indra/newview/skins/default/xui/en/floater_aaa.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml102
-rw-r--r--indra/newview/skins/default/xui/en/floater_land_holdings.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_nearby_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_perm_prefs.xml30
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_line_editor.xml13
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml8
-rw-r--r--indra/newview/skins/default/xui/en/inspect_object.xml10
-rw-r--r--indra/newview/skins/default/xui/en/menu_mini_map.xml22
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_activeim_row.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_chat_header.xml12
-rw-r--r--indra/newview/skins/default/xui/en/panel_im_control_panel.xml17
-rw-r--r--indra/newview/skins/default/xui/en/panel_picks.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml30
-rw-r--r--indra/newview/skins/default/xui/en/panel_sys_well_item.xml4
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml4
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml10
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_item_info.xml6
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_task_info.xml12
25 files changed, 193 insertions, 150 deletions
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png
new file mode 100644
index 0000000000..75bd73cef1
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Off.png b/indra/newview/skins/default/textures/icons/MinusItem_Off.png
new file mode 100644
index 0000000000..6f285f3546
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/MinusItem_Off.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Press.png b/indra/newview/skins/default/textures/icons/MinusItem_Press.png
new file mode 100644
index 0000000000..50f65765d5
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/MinusItem_Press.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8af65b25e9..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" />
@@ -106,7 +136,6 @@
<texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
- <texture name="DropDown_On" file_name="widgets/DropDown_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
@@ -231,6 +260,10 @@
<texture name="Microphone_Mute" file_name="icons/Microphone_Mute.png" preload="false" />
<texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
+ <texture name="MinusItem_Disabled" file_name="icons/MinusItem_Disabled.png" preload="false" />
+ <texture name="MinusItem_Off" file_name="icons/MinusItem_Off.png" preload="false" />
+ <texture name="MinusItem_Press" file_name="icons/MinusItem_Press.png" preload="false" />
+
<texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
<texture name="Move_Fly_Disabled" file_name="bottomtray/Move_Fly_Disabled.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index e4ab533bc5..4bbd561882 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -5,6 +5,6 @@
name="floater_aaa"
can_resize="true"
width="1024">
- <string name="Nudge Parabuild">1</string>
+ <string name="Nudge Parabuild">2</string>
<panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index f553184c19..69f9f6a2f8 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -87,9 +87,9 @@
<button
follows="top|left"
height="18"
- image_disabled="AddItem_Disabled"
- image_selected="AddItem_Press"
- image_unselected="AddItem_Off"
+ image_disabled="MinusItem_Disabled"
+ image_selected="MinusItem_Press"
+ image_unselected="MinusItem_Off"
layout="topleft"
name="zoom_minus_btn"
top_pad="0"
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 4792a1a476..e972cf39bf 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -8,67 +8,71 @@
left="0"
name="panel_im"
top="0"
- can_close="false"
+ can_close="true"
can_dock="true"
- can_minimize="false"
+ can_minimize="true"
visible="true"
- width="320"
+ width="350"
can_resize="true"
min_width="300"
min_height="350">
- <layout_stack follows="all"
- height="350"
- width="300"
- layout="topleft"
- orientation="horizontal"
- name="im_panels"
- top="20"
- left="0">
+ <layout_stack
+ follows="all"
+ height="350"
+ width="300"
+ layout="topleft"
+ orientation="horizontal"
+ name="im_panels"
+ top="20"
+ left="0">
<layout_panel
name="panel_im_control_panel"
layout="topleft"
- top_delta="-3"
- height="350"
follows="left"
label="IM Control Panel"
auto_resize="false"
user_resize="false" />
- <layout_panel height="350"
- width=""
- left_delta="110"
- top="0"
- user_resize="false">
- <button height="20"
- follows="left|top"
- top="0"
- image_overlay="TabIcon_Open_Off"
- layout="topleft"
- width="25"
- name="slide_left_btn" />
- <button height="20"
- follows="left|top"
- top="0"
- image_overlay="TabIcon_Close_Off"
- width="25"
- name="slide_right_btn" />
- <chat_history
- length="1"
- follows="all"
- height="275"
- layout="topleft"
- name="chat_history"
- parse_highlights="true"
- allow_html="true"
- width="160">
- </chat_history>
- <line_editor
- follows="left|right"
- height="20"
- label="To"
- layout="topleft"
- name="chat_editor"
- width="160">
- </line_editor>
+ <layout_panel
+ left="0"
+ top="0"
+ user_resize="false">
+ <button
+ height="20"
+ follows="left|top"
+ top="0"
+ left="2"
+ image_overlay="TabIcon_Open_Off"
+ layout="topleft"
+ width="25"
+ name="slide_left_btn" />
+ <button
+ height="20"
+ follows="left|top"
+ top="0"
+ left="2"
+ image_overlay="TabIcon_Close_Off"
+ width="25"
+ name="slide_right_btn" />
+ <chat_history
+ length="1"
+ font="SansSerifSmall"
+ follows="left|right|top"
+ height="280"
+ name="chat_history"
+ parse_highlights="true"
+ allow_html="true"
+ left="1"
+ width="180">
+ </chat_history>
+ <line_editor
+ follows="left|right|top"
+ font="SansSerifSmall"
+ height="20"
+ label="To"
+ name="chat_editor"
+ top_pad="1"
+ width="180">
+ </line_editor>
</layout_panel>
</layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 2c04a94613..e3751f2bd9 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -42,7 +42,7 @@
</scroll_list>
<button
height="23"
- font="SansSerifBold"
+ font="SansSerif"
label="Teleport"
label_selected="Teleport"
layout="topleft"
@@ -53,7 +53,7 @@
width="80" />
<button
height="23"
- font="SansSerifBold"
+ font="SansSerif"
label="Map"
label_selected="Map"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 69b015a727..d8534bfe0b 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -5,7 +5,7 @@
can_tear_off="false"
can_resize="true"
can_drag_on_left="false"
- can_close="false"
+ can_close="true"
can_dock="true"
bevel_style="in"
height="300"
diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
index 6faab84159..4909b8988f 100644
--- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
@@ -22,10 +22,10 @@
height="16"
label="Share with group"
layout="topleft"
- left_delta="-250"
+ left="10"
name="share_with_group"
- top_delta="2"
- width="106" />
+ top="5"
+ width="150" />
<check_box
control_name="EveryoneCopy"
height="16"
@@ -33,8 +33,8 @@
layout="topleft"
left_delta="0"
name="everyone_copy"
- top_pad="16"
- width="130" />
+ top_pad="5"
+ width="150" />
<text
type="string"
length="1"
@@ -43,8 +43,8 @@
layout="topleft"
left_delta="0"
name="NextOwnerLabel"
- top_pad="16"
- width="88">
+ top_pad="5"
+ width="150">
Next owner can:
</text>
<check_box
@@ -54,17 +54,17 @@
layout="topleft"
left_delta="0"
name="next_owner_modify"
- top_pad="14"
- width="78" />
+ top_pad="5"
+ width="150" />
<check_box
control_name="NextOwnerCopy"
height="16"
label="Copy"
layout="topleft"
- left_delta="78"
+ left_delta="0"
name="next_owner_copy"
- top_delta="0"
- width="88" >
+ top_pad="5"
+ width="150" >
<check_box.commit_callback
function="Perms.Copy" />
</check_box>
@@ -76,10 +76,10 @@
initial_value="true"
label="Resell/Give away"
layout="topleft"
- left_delta="88"
+ left_delta="0"
name="next_owner_transfer"
- top_delta="0"
- width="106" />
+ top_pad="5"
+ width="150" />
</panel>
<button
height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
index e017d404c6..0531b52e5a 100644
--- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
@@ -18,7 +18,18 @@
Enabled line editor
</line_editor>
<line_editor
- enabled="false"
+ height="20"
+ layout="topleft"
+ left_delta="0"
+ name="ascii_line_editor"
+ prevalidate_callback="ascii"
+ tool_tip="ascii line editor"
+ top_pad="10"
+ width="200">
+ ASCII only line editor
+ </line_editor>
+ <line_editor
+ enabled="false"
height="20"
layout="topleft"
left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index bfbfe7de7c..a626e1b353 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -811,11 +811,8 @@
Mixed Sale
</panel.string>
<text
- type="string"
- length="1"
follows="left|top"
height="10"
- layout="topleft"
left="10"
name="Name:"
top="0"
@@ -825,7 +822,6 @@
<line_editor
follows="left|top|right"
height="19"
- layout="topleft"
left_pad="0"
max_length="63"
name="Object Name"
@@ -833,11 +829,8 @@
top_delta="0"
width="170" />
<text
- type="string"
- length="1"
follows="left|top"
height="10"
- layout="topleft"
left="10"
name="Description:"
top_pad="3"
@@ -847,7 +840,6 @@
<line_editor
follows="left|top|right"
height="19"
- layout="topleft"
left_pad="0"
max_length="127"
name="Object Description"
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/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index 5cbbd71bfe..8d0edf018d 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -10,7 +10,6 @@
width="128">
<menu_item_call
label="Zoom Close"
- layout="topleft"
name="Zoom Close">
<menu_item_call.on_click
function="Minimap.Zoom"
@@ -18,7 +17,6 @@
</menu_item_call>
<menu_item_call
label="Zoom Medium"
- layout="topleft"
name="Zoom Medium">
<menu_item_call.on_click
function="Minimap.Zoom"
@@ -26,29 +24,31 @@
</menu_item_call>
<menu_item_call
label="Zoom Far"
- layout="topleft"
name="Zoom Far">
<menu_item_call.on_click
function="Minimap.Zoom"
parameter="far" />
</menu_item_call>
- <menu_item_separator
- layout="topleft"
- name="Tracking Separator" />
+ <menu_item_check
+ label="Rotate Map"
+ name="Rotate Map">
+ <menu_item_check.on_check
+ control="MiniMapRotate" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="MiniMapRotate" />
+ </menu_item_check>
+ <menu_item_separator />
<menu_item_call
label="Stop Tracking"
- layout="topleft"
name="Stop Tracking">
<menu_item_call.on_click
function="Minimap.Tracker"
parameter="task_properties" />
</menu_item_call>
- <menu_item_separator
- layout="topleft"
- name="Tracking Separator" />
+ <menu_item_separator />
<menu_item_call
label="World Map"
- layout="topleft"
name="World Map">
<menu_item_call.on_click
function="ShowFloater"
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_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 323ee957e7..7a3eae35a9 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -3,13 +3,13 @@
background_visible="true"
bevel_style="in"
bg_alpha_color="black"
- follows="top"
+ follows="top|left|right"
height="24"
- label="im_header"
- layout="topleft"
- name="im_header"
- width="300">
- <avatar_icon
+ label="im_header"
+ layout="topleft"
+ name="im_header"
+ width="300">
+ <avatar_icon
follows="left"
height="18"
image_name="Generic_Person"
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 9573904c93..73d843e6dd 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
@@ -38,28 +38,29 @@
label="Teleport"
name="teleport_btn"
width="100" />
- <button
+ <!-- <button
follows="left|top"
height="20"
label="Share"
name="share_btn"
- width="100" />
- <button
+ width="100" />-->
+ <!--Removing pay button to save space - will update spec - verified by Erica/Steve -->
+ <!-- <button
follows="left|top"
height="20"
label="Pay"
name="pay_btn"
- width="100" />
+ width="100" />-->
<panel
background_visible="true"
bg_alpha_color="DkGray2"
border="false"
- follows="left|top"
+ top_pad="10"
+ follows="left|bottom"
height="70"
- left="0"
- left_pad="0"
+ left="1"
name="panel_call_buttons"
- width="110">
+ width="109">
<button
bottom="10"
height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 962dad3363..5cefe3e4ab 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -131,7 +131,7 @@
<button
enabled="false"
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Info"
layout="topleft"
@@ -143,7 +143,7 @@
<button
enabled="false"
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Teleport"
layout="topleft"
@@ -155,7 +155,7 @@
<button
enabled="false"
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Map"
layout="topleft"
@@ -167,7 +167,7 @@
<button
enabled="false"
follows="bottom|right"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="▼"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 8fc78c6701..b1afe76500 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -48,38 +48,40 @@
image_unselected="BuyArrow_Off"
image_pressed="BuyArrow_Press"
height="16"
- left="-245"
+ left="-200"
name="buycurrency"
- pad_right="22px"
+ pad_right="20px"
tool_tip="My Balance: Click to buy more L$"
top="1"
- width="117" />
- <button
- follows="right|bottom"
- height="16"
- image_selected="parcel_drk_VoiceNo"
- image_unselected="parcel_drk_Voice"
- is_toggle="true"
- left_pad="15"
- top="1"
- name="volume_btn"
- width="16" />
+ width="90" />
<text
type="string"
length="1"
+ font="SansSerifSmall"
text_readonly_color="TimeTextColor"
follows="right|bottom"
halign="right"
height="16"
top="5"
layout="topleft"
- left_pad="7"
+ left_pad="-5"
name="TimeText"
text_color="TimeTextColor"
tool_tip="Current time (Pacific)"
width="80">
12:00 AM
</text>
+ <button
+ follows="right|bottom"
+ height="16"
+ image_selected="parcel_drk_VoiceNo"
+ image_unselected="parcel_drk_Voice"
+ is_toggle="true"
+ left_pad="5"
+ top="1"
+ name="volume_btn"
+ tool_tip="Global Volume Control"
+ width="16" />
<text
enabled="true"
follows="right|bottom"
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"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 2ce156cfda..041297a542 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -62,7 +62,7 @@
width="313" />
<button
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Wear"
layout="topleft"
@@ -72,7 +72,7 @@
width="80" />
<button
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="New Outfit"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index cbcc3f10ad..377d34cdcc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -41,7 +41,7 @@
<button
enabled="true"
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Info"
layout="topleft"
@@ -52,7 +52,7 @@
<button
enabled="true"
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Share"
layout="topleft"
@@ -63,7 +63,7 @@
<button
enabled="false"
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Wear"
layout="topleft"
@@ -74,7 +74,7 @@
<button
enabled="false"
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Play"
layout="topleft"
@@ -85,7 +85,7 @@
<button
enabled="false"
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Teleport"
layout="topleft"
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 39cd75074e..0c605650fc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -479,7 +479,7 @@
width="313">
<button
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Edit"
layout="topleft"
@@ -489,7 +489,7 @@
width="50" />
<button
follows="bottom|right"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Cancel"
layout="topleft"
@@ -499,7 +499,7 @@
width="70" />
<button
follows="bottom|right"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Save"
layout="topleft"
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 8eb2254112..7647be7830 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -485,7 +485,7 @@
width="313">
<button
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Edit"
layout="topleft"
@@ -495,7 +495,7 @@
width="50" />
<button
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Open"
layout="topleft"
@@ -505,7 +505,7 @@
width="60" />
<button
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Pay"
layout="topleft"
@@ -515,7 +515,7 @@
width="50" />
<button
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Buy"
layout="topleft"
@@ -525,7 +525,7 @@
width="60" />
<button
follows="bottom|right"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Cancel"
layout="topleft"
@@ -535,7 +535,7 @@
width="70" />
<button
follows="bottom|right"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="Save"
layout="topleft"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 19:27:30 +0000