summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/colors.xml60
-rw-r--r--indra/newview/skins/default/textures/textures.xml33
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.pngbin0 -> 311 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.pngbin0 -> 330 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.pngbin0 -> 311 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.pngbin0 -> 324 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/jump_left_in.pngbin0 -> 342 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/jump_left_out.pngbin0 -> 321 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/jump_right_in.pngbin0 -> 320 bytes
-rw-r--r--indra/newview/skins/default/textures/widgets/jump_right_out.pngbin0 -> 315 bytes
-rw-r--r--indra/newview/skins/default/textures/world/BeaconArrow.pngbin0 -> 1965 bytes
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_container.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml22
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_alerts.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml1
15 files changed, 75 insertions, 43 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
new file mode 100644
index 0000000000..549b3980f6
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
Binary files differ
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
new file mode 100644
index 0000000000..a74abd5d8a
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
new file mode 100644
index 0000000000..36056d0ad9
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
Binary files differ
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
new file mode 100644
index 0000000000..0c1fd6956b
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_in.png b/indra/newview/skins/default/textures/widgets/jump_left_in.png
new file mode 100644
index 0000000000..a1425ccfa0
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/jump_left_in.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_out.png b/indra/newview/skins/default/textures/widgets/jump_left_out.png
new file mode 100644
index 0000000000..38edf47d19
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/jump_left_out.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_in.png b/indra/newview/skins/default/textures/widgets/jump_right_in.png
new file mode 100644
index 0000000000..39359ab2e2
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/jump_right_in.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_out.png b/indra/newview/skins/default/textures/widgets/jump_right_out.png
new file mode 100644
index 0000000000..3f76bbffac
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/jump_right_out.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png
new file mode 100644
index 0000000000..12dc246d51
--- /dev/null
+++ b/indra/newview/skins/default/textures/world/BeaconArrow.png
Binary files differ
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/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index ca547a79e2..adaab17dc4 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_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_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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 09:10:20 +0000