diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:18:09 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:18:09 -0700 |
| commit | 4c225e3fc7b92e68a25efdb1ca8927e266e84ae5 (patch) | |
| tree | bbeaac67cd72a585720b2c8a02e7858f695634d6 /indra/newview | |
| parent | 0ea82ffbcc764049686367a3c5cee101d9fb1fd9 (diff) | |
| parent | 6ec6a75e618f052731c1013faca776cb572211ff (diff) | |
Merge with head
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_login.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 418b933773..4893eeafb1 100755 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -37,9 +37,9 @@ <icon
height="73"
width="165"
- bottom="112"
image_name="login_sl_logo"
left="0"
+ top="25"
name="sl_logo_small" />
<combo_box
left_pad="22"
@@ -79,9 +79,9 @@ <check_box
control_name="RememberPassword"
follows="left|top"
- font="SansSerifLarge"
+ font="SansSerifMedium"
left_pad="20"
- bottom_delta="-16"
+ bottom_delta="-14"
height="24"
label="Remember me"
check_button.bottom="3"
@@ -89,7 +89,7 @@ width="145" />
<text
follows="left|top"
- font="SansSerifLarge"
+ font="SansSerifMedium"
text_color="EmphasisColor"
height="16"
name="forgot_password_text"
@@ -111,7 +111,7 @@ left="0"
width="80"
height="26"
- bottom_delta="56" />
+ bottom_delta="44" />
<text
follows="left|top"
font="SansSerifLarge"
@@ -208,7 +208,7 @@ left="0"
name="login_html"
start_url=""
- top="188"
+ top="154"
height="600"
width="1024" />
</panel>
|