summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_login.xml
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-03 12:24:07 -0800
committerJames Cook <james@lindenlab.com>2009-11-03 12:24:07 -0800
commitf75ce16477af31c2df1d79bcb492ae43c3b380e8 (patch)
treea8a53aa4232509d8679a7f366eedae0cbe03b802 /indra/newview/skins/default/xui/en/panel_login.xml
parent33bced543b09312105ed826780bd9c55918b2add (diff)
Clean up login panel XML and code.
Kill dead "web based login" viewer-auth mWebLoginKey. Port over my reg-in-client code from svn, off by default. Reviewed with Ambroff.
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_login.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml16
1 files changed, 14 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index afe00271f7..c3d199ee93 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -15,10 +15,14 @@
name="real_url">
http://secondlife.com/app/login/
</panel.string>
+ <string name="reg_in_client_url">
+ http://secondlife.eniac15.lindenlab.com/reg-in-client/
+ </string>
<panel.string
name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
+ <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
<web_browser
border_visible="false"
bottom="600"
@@ -26,9 +30,16 @@
layout="topleft"
left="0"
name="login_html"
- right="-1"
start_url=""
- top="1" />
+ top="0"
+ height="600"
+ width="800"/>
+ <panel
+ follows="left|bottom|right"
+ name="login_widgets"
+ layout="topleft"
+ left="0"
+ top="0">
<text
type="string"
length="1"
@@ -215,4 +226,5 @@
width="300">
[VERSION]
</text>
+ </panel>
</panel>