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/3p_icons/fmod_logo.pngbin0 -> 14486 bytes
-rw-r--r--indra/newview/skins/default/textures/3p_icons/havok_logo.pngbin0 -> 41488 bytes
-rw-r--r--indra/newview/skins/default/textures/3p_icons/vivox_logo.pngbin0 -> 2331 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml1
-rw-r--r--indra/newview/skins/default/textures/widgets/ProgressBarSolid.pngbin0 -> 208 bytes
-rw-r--r--indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_progress.xml159
7 files changed, 115 insertions, 53 deletions
diff --git a/indra/newview/skins/default/textures/3p_icons/fmod_logo.png b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png
new file mode 100644
index 0000000000..5a50e0ad34
--- /dev/null
+++ b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/3p_icons/havok_logo.png b/indra/newview/skins/default/textures/3p_icons/havok_logo.png
new file mode 100644
index 0000000000..ff1ea3a72e
--- /dev/null
+++ b/indra/newview/skins/default/textures/3p_icons/havok_logo.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/3p_icons/vivox_logo.png b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png
new file mode 100644
index 0000000000..6f20e87b7a
--- /dev/null
+++ b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b041e6197c..7325d836d2 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -497,6 +497,7 @@ with the same filename but different name
<texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" />
<texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
+ <texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
<texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
<texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
diff --git a/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png b/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png
new file mode 100644
index 0000000000..ec0926bfa1
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index a8342e723b..d783d1e23c 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
can_minimize="false"
- height="488"
+ height="466"
layout="topleft"
name="Inventory Finder"
help_topic="inventory_finder"
@@ -202,7 +202,7 @@
left="8"
mouse_opaque="true"
name="icon_settings"
- top="262"
+ top="242"
width="16" />
<check_box
height="16"
@@ -220,7 +220,7 @@
layout="topleft"
left="8"
name="All"
- top="282"
+ top="262"
width="100" />
<button
height="20"
@@ -368,6 +368,6 @@
layout="topleft"
name="Close"
right="-6"
- top="454"
+ top="434"
width="76" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 860caf2d21..e77d097d5f 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -44,68 +44,129 @@
width="670" />
<layout_panel
auto_resize="false"
- height="250"
+ height="275"
layout="topleft"
- min_height="250"
+ min_height="275"
name="panel4"
width="670">
<icon
color="LoginProgressBoxCenterColor"
follows="left|right|bottom|top"
- height="250"
+ height="275"
image_name="Rounded_Square"
layout="topleft"
left="0"
top="0"
width="670" />
- <text
- follows="left|right|top"
- font="SansSerifHuge"
- font_shadow="none"
- halign="left"
- height="20"
- layout="topleft"
- left_delta="47"
- name="title_text"
- text_color="LoginProgressBoxTextColor"
- top_delta="50"
- right="-47"/>
- <text
- follows="left|right|top"
- font="SansSerif"
- font_shadow="none"
- halign="left"
- height="20"
- layout="topleft"
- left_delta="0"
- name="progress_text"
- text_color="LoginProgressBoxTextColor"
- top_pad="5"
- right="-47"
- word_wrap="true"/>
- <progress_bar
- bottom="115"
- color_bar="1 1 1 0.96"
- follows="left|right|top"
- height="16"
- layout="topleft"
- left="45"
- name="login_progress_bar"
- right="-45" />
- <text
+ <layout_stack
follows="left|right|top|bottom"
- font="SansSerifLarge"
- font_shadow="none"
- halign="left"
- height="100"
+ height="275"
layout="topleft"
- left="45"
- line_spacing.pixels="2"
- name="message_text"
- text_color="LoginProgressBoxTextColor"
- top="145"
- right="-90"
- word_wrap="true"/>
+ left="0"
+ orientation="vertical"
+ name="vertical_centering"
+ animate="false"
+ top="0"
+ width="670">
+ <layout_panel
+ auto_resize="false"
+ height="30"
+ layout="topleft"
+ min_height="30"
+ name="panel_top_spacer"
+ width="670">
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ height="100"
+ layout="topleft"
+ min_height="100"
+ name="panel_login"
+ width="670">
+ <text
+ follows="left|right|top"
+ layout="topleft"
+ font="SansSerifHuge"
+ font_shadow="none"
+ halign="left"
+ height="20"
+ left="47"
+ top="32"
+ right="-47"
+ name="title_text"
+ text_color="LoginProgressBoxTextColor"/>
+ <text
+ follows="left|right|top"
+ layout="topleft"
+ font="SansSerif"
+ font_shadow="none"
+ halign="left"
+ height="20"
+ top_pad="5"
+ right="-47"
+ left_delta="0"
+ name="progress_text"
+ text_color="LoginProgressBoxTextColor"
+ word_wrap="true"/>
+ <progress_bar
+ color_bar="0 0.67 0.9 0.96"
+ follows="left|right|top"
+ layout="topleft"
+ image_fill="ProgressBarSolid"
+ height="16"
+ left="45"
+ top_pad="5"
+ name="login_progress_bar"
+ right="-45" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ height="110"
+ layout="topleft"
+ min_height="110"
+ name="panel_motd"
+ width="670">
+ <text
+ follows="left|right|top|bottom"
+ font="SansSerifLarge"
+ font_shadow="none"
+ halign="left"
+ valign="center"
+ height="100"
+ layout="topleft"
+ left="45"
+ line_spacing.pixels="2"
+ name="message_text"
+ text_color="LoginProgressBoxTextColor"
+ top="7"
+ right="-90"
+ word_wrap="true"/>
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ height="40"
+ layout="topleft"
+ min_height="40"
+ name="panel_icons"
+ width="670">
+ <!--Logos are tied to following label from code-->
+ <text
+ follows="left|right|top"
+ layout="topleft"
+ font="SansSerifLarge"
+ font_shadow="none"
+ halign="left"
+ height="16"
+ width="240"
+ left="47"
+ top="6"
+ line_spacing.pixels="2"
+ name="logos_lbl"
+ text_color="LoginProgressBoxTextColor">
+ Second Life uses
+ </text>
+ </layout_panel>
+ </layout_stack>
</layout_panel>
<layout_panel
height="200"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 23:51:20 +0000