diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-03-13 17:11:14 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-03-13 17:11:14 -0700 |
| commit | bf39dfac471df7480e317b371a58d6b6a49fae26 (patch) | |
| tree | 4c8111b0793ddd0c5366464f9bde5203b257e8eb | |
| parent | 70ef486b1f8b98881b1d8d28732cc654a5a1e680 (diff) | |
WENG-1470 (Partial) Secondlife Login Screen Redesign - changed layout based on designer feedback.
| -rwxr-xr-x | indra/newview/llpanellogin.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_login.xml | 38 |
2 files changed, 36 insertions, 3 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 7e74fce3ce..95c95730ec 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -1092,6 +1092,7 @@ void LLPanelLogin::onSelectServer() // the grid specified by the location is not this one, so clear the combo location_combo->setCurrentByIndex(0); // last location on the new grid location_combo->setTextEntry(LLStringUtil::null); + mFavoriteSelected = true; } } break; diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index a80f365c54..239e9a777c 100755 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -12,12 +12,36 @@ name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
+ <layout_stack
+ follows="left|right|top|bottom"
+ height="172"
+ min_height="172"
+ left="0"
+ name="ui_stack"
+ orientation="horizontal"
+ top="0"
+ width="1024">
+ <layout_panel
+ height="172"
+ auto_resize="true"
+ name="ui_elastic_pad_left"
+ min_height="172"
+ width="32" />
+ <layout_panel
+ auto_resize="false"
+ follows="left|right|top"
+ name="ui_container"
+ width="960"
+ min_height="172"
+ left="0"
+ top="0"
+ height="172">
<icon
height="73"
width="165"
bottom="112"
image_name="login_sl_logo"
- left="32"
+ left="0"
name="sl_logo_small" />
<combo_box
left_pad="22"
@@ -86,7 +110,7 @@ font="SansSerifMedium"
name="connect_btn"
enabled="true"
- left="32"
+ left="0"
width="80"
height="26"
bottom_delta="56" />
@@ -170,6 +194,14 @@ top_pad="2"
name="server_combo"
width="128" />
+ </layout_panel>
+ <layout_panel
+ height="172"
+ auto_resize="true"
+ name="ui_elastic_pad_right"
+ min_height="172"
+ width="32" />
+ </layout_stack>
<web_browser
tab_stop="false"
trusted_content="true"
@@ -179,7 +211,7 @@ left="0"
name="login_html"
start_url=""
- top_delta="64"
+ top="188"
height="600"
width="1024" />
</panel>
|