diff options
author | James Cook <james@lindenlab.com> | 2009-11-03 12:24:51 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-03 12:24:51 -0800 |
commit | 6ec038c0cad54f36d89678df63ae7526f5fb5bca (patch) | |
tree | 5dac3420eb2e4988011a46709ae671572e6b083b /indra/newview/skins/default/xui | |
parent | e87975284e2b50c81d95bbb9672678ae262288be (diff) | |
parent | f75ce16477af31c2df1d79bcb492ae43c3b380e8 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 16 |
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 317c79e08f..1646cba0a7 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -15,19 +15,30 @@ 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" follows="all" 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 follows="left|bottom" font="SansSerif" @@ -182,4 +193,5 @@ width="300"> [VERSION] </text> + </panel> </panel> |