From f3238a700eb387dc87d75c2ee0032ecad9e29b54 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 23 Feb 2011 16:41:46 -0800
Subject: remove skylight progress screen and unused skylight textures

---
 .../minimal/textures/login_teleport_background.jpg | Bin 130026 -> 0 bytes
 indra/newview/skins/minimal/textures/sl_logo.png   | Bin 4542 -> 0 bytes
 indra/newview/skins/minimal/textures/textures.xml  |   2 --
 indra/newview/skins/minimal/xui/en/main_view.xml   |   9 +--------
 .../skins/minimal/xui/en/panel_progress.xml        |  21 ---------------------
 5 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 indra/newview/skins/minimal/textures/login_teleport_background.jpg
 delete mode 100644 indra/newview/skins/minimal/textures/sl_logo.png
 delete mode 100644 indra/newview/skins/minimal/xui/en/panel_progress.xml

(limited to 'indra')

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
Binary files a/indra/newview/skins/minimal/textures/login_teleport_background.jpg and /dev/null 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
Binary files a/indra/newview/skins/minimal/textures/sl_logo.png and /dev/null 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>
-- 
cgit v1.2.3