summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/skins/minimal/textures/login_teleport_background.jpgbin130026 -> 0 bytes
-rw-r--r--indra/newview/skins/minimal/textures/sl_logo.pngbin4542 -> 0 bytes
-rw-r--r--indra/newview/skins/minimal/textures/textures.xml2
-rw-r--r--indra/newview/skins/minimal/xui/en/main_view.xml9
-rw-r--r--indra/newview/skins/minimal/xui/en/panel_progress.xml21
5 files changed, 1 insertions, 31 deletions
diff --git a/indra/newview/skins/minimal/textures/login_teleport_background.jpg b/indra/newview/skins/minimal/textures/login_teleport_background.jpg
deleted file mode 100644
index 43bf0a58f4..0000000000
--- a/indra/newview/skins/minimal/textures/login_teleport_background.jpg
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/minimal/textures/sl_logo.png b/indra/newview/skins/minimal/textures/sl_logo.png
deleted file mode 100644
index 71830e7451..0000000000
--- a/indra/newview/skins/minimal/textures/sl_logo.png
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/minimal/textures/textures.xml b/indra/newview/skins/minimal/textures/textures.xml
index 432b2c20c8..8dd56e20d8 100644
--- a/indra/newview/skins/minimal/textures/textures.xml
+++ b/indra/newview/skins/minimal/textures/textures.xml
@@ -1,7 +1,5 @@

<textures version="101">
<texture name="Button_Separator" file_name="bottomtray/button_separator.png" preload="true" />
- <texture name="login_teleport_background.jpg" preload="true"/>
<texture name="arrow_keys.png"/>
- <texture name="sl_logo.png"/>
</textures>
diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 88f06d9e63..629496db81 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -121,14 +121,7 @@
left="0"
mouse_opaque="false"
name="world_view_rect"
- width="500">
- <icon name="sl_watermark"
- image_name="sl_logo.png"
- left="5"
- top="5"
- width="100"
- height="45"/>
- </panel>
+ width="500"/>
</layout_panel>
<layout_panel auto_resize="false"
min_height="33"
diff --git a/indra/newview/skins/minimal/xui/en/panel_progress.xml b/indra/newview/skins/minimal/xui/en/panel_progress.xml
deleted file mode 100644
index 03e4ee5aed..0000000000
--- a/indra/newview/skins/minimal/xui/en/panel_progress.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="left|bottom|right|top"
- height="768"
- layout="topleft"
- left="0"
- name="login_progress_panel"
- background_visible="true"
- background_opaque="true"
- bg_opaque_image="login_teleport_background.jpg"
- top="768"
- width="1024">
- <progress_bar
- bottom="35"
- color_bar="1 1 1 0.96"
- height="16"
- left="220"
- name="login_progress_bar"
- follows="left|right|bottom"
- right="-220" />
-</panel>