From bf39dfac471df7480e317b371a58d6b6a49fae26 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 13 Mar 2014 17:11:14 -0700 Subject: WENG-1470 (Partial) Secondlife Login Screen Redesign - changed layout based on designer feedback. --- indra/newview/llpanellogin.cpp | 1 + indra/newview/skins/default/xui/en/panel_login.xml | 38 ++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) (limited to 'indra/newview') 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 + + + @@ -170,6 +194,14 @@ top_pad="2" name="server_combo" width="128" /> + + + -- cgit v1.2.3