diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-09-11 12:13:48 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-09-11 12:13:48 -0400 |
| commit | f8207208f07b7e239ee9bdaf4b45838d3b595c40 (patch) | |
| tree | 28511cb63b958282e794631756b554853dd35d9f /indra/newview/skins | |
| parent | a8aa7dbd8b64113573ee33ee7c267f17b26c3c39 (diff) | |
| parent | 695c4135ff6fa0c50daa4c84f23096096ffd8a54 (diff) | |
Merge up to http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/zh/notifications.xml | 1 |
2 files changed, 2 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 9c96143aa3..6c4cbd4627 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -31,6 +31,7 @@ width="996"/> <layout_stack animate="false" + clip="false" follows="left|bottom|right" name="login_widgets" layout="topleft" @@ -223,7 +224,7 @@ follows="right|bottom" name="links" width="210" - min_width="210" + min_width="100" height="80"> <text follows="right|bottom" diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 97a1bd6c84..fe4f84dce7 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -1122,7 +1122,6 @@ [APP_NAME] 安裝完成。 如果你是第一次使用 [SECOND_LIFE]，你將需要建立新帳號才可登入。 -返回 [http://join.secondlife.com secondlife.com] 建立新帳號？ <usetemplate name="okcancelbuttons" notext="繼續" yestext="新帳戶..."/> </notification> <notification name="LoginPacketNeverReceived"> |