aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
authorDavid Seikel2011-03-01 21:25:50 +1000
committerDavid Seikel2011-03-01 21:25:50 +1000
commit68c3c87eb33ec28bbf66390901931fe70efb3360 (patch)
treece1c7b19a1b03e87983c994b4aba9f0c422e4ff0 /linden/indra/newview/skins
parentMerge branch 'branding' into weekly, with some post merge branding tweeks. (diff)
downloadmeta-impy-68c3c87eb33ec28bbf66390901931fe70efb3360.zip
meta-impy-68c3c87eb33ec28bbf66390901931fe70efb3360.tar.gz
meta-impy-68c3c87eb33ec28bbf66390901931fe70efb3360.tar.bz2
meta-impy-68c3c87eb33ec28bbf66390901931fe70efb3360.tar.xz
Revert "Added a "news bar" at the bottom of the login screen."
Seems like something that is better done in the login page for us, and stops people bitching about how insecure this viewer is due to sending stuff to the impy server. They are still sensative after the Emerald fiasco. This reverts commit 373179115193077d258881d54cc1c07edf99c3a5.
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_login.xml23
1 files changed, 8 insertions, 15 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 13e8ff6..75c635e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -5,7 +5,7 @@
5 follows="left|top|right|bottom" mouse_opaque="true" > 5 follows="left|top|right|bottom" mouse_opaque="true" >
6 6
7 <web_browser name="login_html" 7 <web_browser name="login_html"
8 bottom="102" top="-1" left="0" right="-1" 8 bottom="0" top="-1" left="0" right="-1"
9 border_visible="false" follows="top|left|bottom|right" 9 border_visible="false" follows="top|left|bottom|right"
10 start_url="data:text/html, 10 start_url="data:text/html,
11 %3Chtml%3E 11 %3Chtml%3E
@@ -33,7 +33,7 @@
33 <!-- START LOCATION --> 33 <!-- START LOCATION -->
34 34
35 <text name="start_location_text" 35 <text name="start_location_text"
36 bottom="32" left="10" height="16" right="115" 36 bottom="8" left="10" height="16" right="115"
37 follows="left|bottom" h_pad="0" halign="right" v_pad="0" 37 follows="left|bottom" h_pad="0" halign="right" v_pad="0"
38 bg_visible="false" drop_shadow_visible="true" 38 bg_visible="false" drop_shadow_visible="true"
39 border_visible="false" border_drop_shadow_visible="false" 39 border_visible="false" border_drop_shadow_visible="false"
@@ -59,7 +59,7 @@
59 <!-- FIRST NAME --> 59 <!-- FIRST NAME -->
60 60
61 <text name="first_name_text" 61 <text name="first_name_text"
62 bottom="80" left="24" height="16" width="120" 62 bottom="56" left="24" height="16" width="120"
63 follows="left|bottom" h_pad="0" halign="left" v_pad="0" 63 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
64 bg_visible="false" drop_shadow_visible="true" 64 bg_visible="false" drop_shadow_visible="true"
65 border_visible="false" border_drop_shadow_visible="false" 65 border_visible="false" border_drop_shadow_visible="false"
@@ -123,7 +123,7 @@
123 <!-- GRIDS --> 123 <!-- GRIDS -->
124 124
125 <text name="grid_text" 125 <text name="grid_text"
126 bottom="80" left_delta="150" height="16" width="120" 126 bottom="56" left_delta="150" height="16" width="120"
127 follows="left|bottom" h_pad="0" halign="left" v_pad="0" 127 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
128 bg_visible="false" drop_shadow_visible="true" 128 bg_visible="false" drop_shadow_visible="true"
129 border_visible="false" border_drop_shadow_visible="false" 129 border_visible="false" border_drop_shadow_visible="false"
@@ -143,7 +143,7 @@
143 <!-- LOG IN --> 143 <!-- LOG IN -->
144 144
145 <button name="connect_btn" label="Log In" 145 <button name="connect_btn" label="Log In"
146 bottom="58" left_delta="140" height="24" width="120" 146 bottom="34" left_delta="140" height="24" width="120"
147 follows="left|bottom" font="SansSerif" halign="center" 147 follows="left|bottom" font="SansSerif" halign="center"
148 mouse_opaque="true" scale_image="TRUE" /> 148 mouse_opaque="true" scale_image="TRUE" />
149 149
@@ -151,7 +151,7 @@
151 <!-- ACCOUNT / FORGOT PASSWORD --> 151 <!-- ACCOUNT / FORGOT PASSWORD -->
152 152
153 <text name="create_new_account_text" 153 <text name="create_new_account_text"
154 bottom="69" left="-210" height="16" width="200" 154 bottom="45" left="-210" height="16" width="200"
155 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 155 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
156 bg_visible="false" drop_shadow_visible="true" 156 bg_visible="false" drop_shadow_visible="true"
157 border_visible="false" border_drop_shadow_visible="false" 157 border_visible="false" border_drop_shadow_visible="false"
@@ -161,7 +161,7 @@
161 </text> 161 </text>
162 162
163 <text name="forgot_password_text" 163 <text name="forgot_password_text"
164 bottom="49" left="-210" height="16" width="200" 164 bottom="25" left="-210" height="16" width="200"
165 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 165 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
166 bg_visible="false" drop_shadow_visible="true" 166 bg_visible="false" drop_shadow_visible="true"
167 border_visible="false" border_drop_shadow_visible="false" 167 border_visible="false" border_drop_shadow_visible="false"
@@ -174,7 +174,7 @@
174 <!-- CHANNEL & VERSION --> 174 <!-- CHANNEL & VERSION -->
175 175
176 <text name="channel_text" 176 <text name="channel_text"
177 bottom="29" left="-310" height="16" width="300" 177 bottom="5" left="-310" height="16" width="300"
178 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 178 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
179 bg_visible="false" drop_shadow_visible="true" 179 bg_visible="false" drop_shadow_visible="true"
180 border_visible="false" border_drop_shadow_visible="false" 180 border_visible="false" border_drop_shadow_visible="false"
@@ -182,11 +182,4 @@
182 hover="true" hover_color="50 115 185"> 182 hover="true" hover_color="50 115 185">
183 [CHANNEL] [VERSION] 183 [CHANNEL] [VERSION]
184 </text> 184 </text>
185
186
187 <web_browser name="news_bar"
188 bottom="0" top="20" left="0" right="-1"
189 border_visible="true" follows="left|bottom|right"
190 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000%22%3E%3C/body%3E%3C/html%3E" />
191
192</panel> 185</panel>