summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/skins/default/colors.xml4
-rw-r--r--indra/newview/skins/default/textures/textures.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml13
-rw-r--r--indra/newview/skins/default/xui/en/widgets/accordion_tab.xml1
4 files changed, 11 insertions, 10 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index eb8ec00bb9..a8ca80eab9 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -270,10 +270,10 @@
reference="White" />
<color
name="FilterBackgroundColor"
- reference="DkGray" />
+ reference="MouseGray" />
<color
name="FilterTextColor"
- value="1 0.78 0.27 1" />
+ value="0.38 0.69 0.57 1" />
<color
name="FloaterButtonImageColor"
reference="LtGray" />
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 3576b6ed77..c7810c6d55 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -53,6 +53,9 @@ with the same filename but different name
<texture name="Arrow_Left" file_name="widgets/Arrow_Left.png" preload="true" />
<texture name="Arrow_Right" file_name="widgets/Arrow_Right.png" preload="true" />
+ <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
+ <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png" preload="true" />
+
<texture name="Arrow_Small_Up" file_name="widgets/Arrow_Small_Up.png" preload="true" />
<texture name="Arrow_Small_Left" file_name="widgets/Arrow_Small_Left.png" preload="true" />
<texture name="Arrow_Small_Right" file_name="widgets/Arrow_Small_Right.png" preload="true" />
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 65bc48265d..e357301152 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -42,28 +42,27 @@
<button
auto_resize="true"
halign="right"
- follows="right|bottom"
+ follows="right|top"
image_selected="BuyArrow_Over"
image_unselected="BuyArrow_Off"
image_pressed="BuyArrow_Press"
height="16"
- left="-200"
+ right="-120"
name="buycurrency"
pad_right="20px"
tool_tip="My Balance: Click to buy more L$"
- top="1"
+ top="0"
width="90" />
<text
type="string"
- length="1"
font="SansSerifSmall"
text_readonly_color="TimeTextColor"
follows="right|bottom"
halign="right"
height="16"
- top="5"
+ top="4"
layout="topleft"
- left_pad="-5"
+ left_pad="-7"
name="TimeText"
text_color="TimeTextColor"
tool_tip="Current time (Pacific)"
@@ -76,7 +75,7 @@
image_selected="parcel_drk_VoiceNo"
image_unselected="parcel_drk_Voice"
is_toggle="true"
- left_pad="5"
+ left_pad="18"
top="1"
name="volume_btn"
tool_tip="Global Volume Control"
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 08c337455c..c0e1944f56 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<accordion_tab
- font="SansSerifBold"
header_bg_color="DkGray2"
header_collapse_img="Accordion_ArrowClosed_Off"
header_collapse_img_pressed="Accordion_ArrowClosed_Press"