summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/skins/default/colors.xml2
-rw-r--r--indra/newview/skins/default/textures/bottomtray/Notices_Unread.pngbin331 -> 3693 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/Unread_IM.pngbin416 -> 458 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/WellButton_Lit.pngbin288 -> 553 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.pngbin405 -> 687 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml6
-rw-r--r--indra/newview/skins/default/xui/en/menu_land.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml84
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml40
9 files changed, 80 insertions, 54 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 33dd7791dc..b6995d2122 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -67,7 +67,7 @@
value="0 0 1 1" />
<color
name="Yellow"
- value="1 1 0 1" />
+ value="0.114 0.65 0.1" />
<color
name="Unused?"
value="1 0.5 0 1" />
diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
index aa3898ca99..0ac5b72b8f 100644
--- a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
+++ b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
index 598342ea80..5c0c85b864 100644
--- a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
+++ b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
index 60676b43fd..dd9133bcc4 100644
--- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
+++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
index 98cde96aff..0080e71f41 100644
--- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
+++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index bab39b10ab..0317d55768 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -593,9 +593,9 @@ with the same filename but different name
<texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" />
<texture name="Unread_Msg" file_name="bottomtray/Unread_Msg.png" preload="false" />
-
- <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" />
- <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" />
+
+ <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+ <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="VoicePTT_Lvl1" file_name="bottomtray/VoicePTT_Lvl1.png" preload="false" />
<texture name="VoicePTT_Lvl2" file_name="bottomtray/VoicePTT_Lvl2.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
index 54e2b7650e..d88a2f8d25 100644
--- a/indra/newview/skins/default/xui/en/menu_land.xml
+++ b/indra/newview/skins/default/xui/en/menu_land.xml
@@ -3,7 +3,7 @@
layout="topleft"
name="Land Pie">
<menu_item_call
- label="Place Information"
+ label="About Land"
name="Place Information...">
<menu_item_call.on_click
function="ShowFloater"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index a41d492624..034f685ee9 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -114,7 +114,7 @@
width="82"
tool_tip="Shows/hides gestures">
<gesture_combo_box.drop_down_button
- pad_right="10"
+ pad_right="10"
use_ellipses="true" />
</gesture_combo_box>
</layout_panel>
@@ -126,7 +126,7 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
- min_width="4"
+ min_width="4"
name="DUMMY"
top="0"
width="4"/>
@@ -168,7 +168,7 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
- min_width="4"
+ min_width="4"
name="DUMMY"
top="0"
width="4"/>
@@ -211,7 +211,7 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
- min_width="4"
+ min_width="4"
name="DUMMY"
top="0"
width="4"/>
@@ -243,7 +243,7 @@
<layout_panel
mouse_opaque="false"
follows="left|right"
- height="28"
+ height="29"
layout="topleft"
top="0"
name="chiclet_list_panel"
@@ -251,24 +251,24 @@
min_width="180"
user_resize="false"
auto_resize="true">
-<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
+<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
<chiclet_panel
mouse_opaque="false"
follows="left|right"
height="23"
layout="topleft"
- left="0"
+ left="1"
min_width="180"
name="chiclet_list"
- top="4"
+ top="6"
chiclet_padding="4"
scrolling_offset="40"
width="189">
<button
auto_resize="true"
follows="right"
- height="23"
+ height="29"
image_selected="SegmentedBtn_Left_Off"
image_unselected="SegmentedBtn_Left_Off"
image_hover_selected="SegmentedBtn_Left_Over"
@@ -278,14 +278,16 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
image_overlay="Arrow_Small_Left"
layout="topleft"
name="chicklet_left_scroll_button"
+ scale_image="true"
tab_stop="false"
- top="0"
+ top="-2"
+ right_pad="2"
visible="false"
- width="20" />
+ width="7" />
<button
auto_resize="true"
follows="right"
- height="23"
+ height="29"
image_selected="SegmentedBtn_Right_Off"
image_unselected="SegmentedBtn_Right_Off"
image_hover_selected="SegmentedBtn_Right_Over"
@@ -295,10 +297,11 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
image_overlay="Arrow_Small_Right"
layout="topleft"
name="chicklet_right_scroll_button"
+ scale_image="true"
tab_stop="false"
- top="0"
+ top="-2"
visible="false"
- width="20" />
+ width="7" />
</chiclet_panel>
</layout_panel>
<icon
@@ -309,7 +312,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
image_name="spacer24.tga"
layout="topleft"
left="0"
- min_width="4"
+ min_width="4"
top="0"
width="5"/>
<layout_panel
@@ -320,18 +323,18 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
min_height="28"
top="0"
name="im_well_panel"
- width="34"
- min_width="34"
+ width="35"
+ min_width="35"
user_resize="false">
<chiclet_im_well
- flash_period="0.3"
+ flash_period="0.3"
follows="right"
height="23"
layout="topleft"
left="0"
name="im_well"
top="4"
- width="34">
+ width="35">
<!--
Emulate 4 states of button by background images, see detains in EXT-3147. The same should be for notification_well button
xml attribute Description
@@ -342,21 +345,22 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
-->
<button
auto_resize="true"
- flash_color="EmphasisColor"
+ flash_color="Yellow"
follows="right"
halign="center"
height="23"
- image_overlay="Notices_Unread"
- image_overlay_alignment="center"
- image_pressed="WellButton_Lit"
- image_pressed_selected="WellButton_Lit_Selected"
- image_selected="PushButton_Selected_Press"
+ image_overlay="Unread_IM"
+ image_overlay_alignment="center"
+ image_pressed="WellButton_Lit_Selected"
+ image_pressed_selected="WellButton_Lit"
+ image_selected="WellButton_Lit"
+ label_color="Black"
left="0"
max_displayed_count="99"
name="Unread IM messages"
pad_left="0"
pad_right="0"
- width="34" >
+ width="35" >
<button.init_callback
function="Button.SetDockableFloaterToggle"
parameter="im_well_window" />
@@ -370,9 +374,10 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
layout="topleft"
min_height="28"
top="0"
+ left_pad="4"
name="notification_well_panel"
- width="34"
- min_width="34"
+ width="35"
+ min_width="35"
user_resize="false">
<chiclet_notification
flash_period="0.25"
@@ -383,23 +388,24 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
max_displayed_count="99"
name="notification_well"
top="4"
- width="34">
+ width="35">
<button
- image_selected="PushButton_Selected_Press"
- image_pressed="WellButton_Lit"
- image_pressed_selected="WellButton_Lit_Selected"
+ bottom_pad="3"
+ image_selected="WellButton_Lit"
+ image_pressed="WellButton_Lit_Selected"
+ image_pressed_selected="WellButton_Lit "
auto_resize="true"
halign="center"
height="23"
follows="right"
- flash_color="EmphasisColor"
- left="0"
+ flash_color="Yellow"
+ label_color="Black"
+ left="5"
name="Unread"
image_overlay="Notices_Unread"
- image_overlay_alignment="center"
- pad_right="0"
- pad_left="0"
- width="34" >
+ image_overlay_alignment="center"
+ pad_right="5"
+ width="35" >
<button.init_callback
function="Button.SetDockableFloaterToggle"
parameter="notification_well_window" />
@@ -413,7 +419,7 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
height="10"
image_name="spacer24.tga"
layout="topleft"
- min_width="4"
+ min_width="4"
right="-1"
top="0"
width="4"/>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index c9db75b5d8..6187b8f1e2 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -33,21 +33,31 @@ name="login_html"
start_url=""
top="0"
height="600"
- width="996" />
-<panel
+ width="980" />
+<layout_stack
follows="left|bottom|right"
name="login_widgets"
layout="topleft"
+orientation="horizontal"
top="519"
width="996"
- height="80">
+height="80">
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="login"
+layout="topleft"
+width="695"
+min_width="695"
+user_resize="false"
+height="80">
<text
follows="left|bottom"
font="SansSerifSmall"
height="16"
-left="20"
name="first_name_text"
top="20"
+left="20"
width="150">
First name:
</text>
@@ -145,7 +155,7 @@ name="Typeregionname" value="" />
<combo_box
allow_text_entry="true"
font="SansSerifSmall"
- follows="left|bottom"
+ follows="left|right|bottom"
height="23"
layout="topleft"
top_pad="2"
@@ -164,14 +174,20 @@ width="135"
name="connect_btn"
top="35"
width="90" />
- <text
+</layout_panel>
+<layout_panel
+follows="right|bottom"
+name="links"
+width="200"
+min_width="200"
+user_resize="false"
+height="80">
+ <text
follows="right|bottom"
font="SansSerifSmall"
-text_color="EmphasisColor"
halign="right"
height="16"
top="12"
-left_pad="5"
right="-10"
name="create_new_account_text"
width="180">
@@ -183,7 +199,9 @@ font="SansSerifSmall"
text_color="EmphasisColor"
halign="right"
height="16"
-name="forgot_password_text" top_pad="12"
+name="forgot_password_text"
+top_pad="12"
+right="-10"
width="180">
Forgot your name or password?
</text>
@@ -195,6 +213,7 @@ halign="right"
height="16"
name="login_help"
top_pad="2"
+right="-10"
width="180">
Need help logging in? </text>
<!-- <text
@@ -208,5 +227,6 @@ top_pad="2"
word_wrap="true">
[VERSION]
</text>-->
-</panel>
+ </layout_panel>
+</layout_stack>
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 00:05:05 +0000