From 11915dc888da5d20c42167c7ba4f7afdf6911f45 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Mon, 3 Mar 2014 16:38:38 -0800 Subject: WENG-1470 (Partial impl) Secondlife Login Screen Redesign --- indra/newview/app_settings/settings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4c7b192ae5..2e8d289148 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5293,6 +5293,18 @@ Value 1 + LoginContentVersion + + Comment + Version of login page web based content to display + Persist + 0 + Type + String + Value + 2 + + LoginSRVTimeout Comment -- cgit v1.3 From f8a3eb551f1f546dfb1b887c98a8eab80d322003 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 5 Mar 2014 14:48:50 -0800 Subject: WENG-1470 (Partial) Secondlife Login Screen Redesign - steady progress --- indra/newview/app_settings/settings.xml | 11 ++++++++++ .../newview/app_settings/settings_per_account.xml | 2 +- indra/newview/llpanellogin.cpp | 25 ++++++++++++++++------ 3 files changed, 31 insertions(+), 7 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2e8d289148..8c57b70e20 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4171,6 +4171,17 @@ Value 255 + ForceLoginURL + + Comment + Force a specified URL for login page content - used if exists + Persist + 1 + Type + String + Value + + ForceShowGrid Comment diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 500151c935..fc6f1f6395 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -312,7 +312,7 @@ Type Boolean Value - 0 + 1 diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 6af0cac864..7a6a9309a0 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -272,7 +272,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, childSetAction("connect_favorite_btn", onClickConnectFavorite, this); childSetAction("connect_location_btn", onClickConnectLocation, this); - getChild("links_login_panel")->setDefaultBtn("connect_btn"); + setDefaultBtn("connect_btn"); std::string channel = LLVersionInfo::getChannel(); std::string version = llformat("%s (%d)", @@ -626,11 +626,12 @@ void LLPanelLogin::updateLocationSelectorsVisibility() { if (sInstance) { - BOOL show_start = gSavedSettings.getBOOL("ShowStartLocation"); - sInstance->getChild("start_location_panel")->setVisible(show_start); - BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid"); - sInstance->getChild("grid_panel")->setVisible(show_server); + LLComboBox* server_combo = sInstance->getChild("server_combo"); + if ( server_combo ) + { + server_combo->setVisible(show_server); + } } } @@ -754,6 +755,13 @@ void LLPanelLogin::loadLoginPage() LL_DEBUGS("AppInit") << "login_page: " << login_page << LL_ENDL; + // allow users (testers really) to specify a different login content URL + std::string force_login_url = gSavedSettings.getString("ForceLoginURL"); + if ( force_login_url.length() ) + { + login_page = LLURI(force_login_url); + } + // Language params["lang"] = LLUI::getLanguage(); @@ -791,7 +799,7 @@ void LLPanelLogin::loadLoginPage() LLMediaCtrl* web_browser = sInstance->getChild("login_html"); if (web_browser->getCurrentNavUrl() != login_uri.asString()) { - LL_DEBUGS("AppInit") << "loading: " << login_uri << LL_ENDL; + llinfos << "login page loading: " << login_uri << llendl; web_browser->navigateTo( login_uri.asString(), "text/html" ); } } @@ -823,6 +831,11 @@ void LLPanelLogin::onClickConnectFavorite(void *) void LLPanelLogin::onClickConnectLocation(void *) { + std::string location = sInstance->getChild("location_edit")->getValue().asString(); + LLStartUp::setStartSLURL(location); + + void* unused_parameter = 0; + LLPanelLogin::sInstance->onClickConnect(unused_parameter); } // static -- cgit v1.3 From bf46ac548bb3db0c4412ac982fb41cbbd295bda7 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 5 Mar 2014 15:47:45 -0800 Subject: WENG-1470 (Partial) Secondlife Login Screen Redesign - more steady progress --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llpanellogin.cpp | 9 ++-- .../default/xui/en/panel_preferences_general.xml | 63 ++++++++-------------- .../default/xui/en/panel_preferences_privacy.xml | 11 ---- 4 files changed, 30 insertions(+), 55 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8c57b70e20..de1abd0bea 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4180,7 +4180,7 @@ Type String Value - + ForceShowGrid diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 7a6a9309a0..437db62cac 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -272,7 +272,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, childSetAction("connect_favorite_btn", onClickConnectFavorite, this); childSetAction("connect_location_btn", onClickConnectLocation, this); - setDefaultBtn("connect_btn"); + LLButton* def_btn = getChild("connect_btn"); + setDefaultBtn(def_btn); std::string channel = LLVersionInfo::getChannel(); std::string version = llformat("%s (%d)", @@ -643,6 +644,7 @@ void LLPanelLogin::onUpdateStartSLURL(const LLSLURL& new_start_slurl) LL_DEBUGS("AppInit")<getChild("start_location_combo"); + LLLineEditor* location_edit = sInstance->getChild("location_edit"); /* * Determine whether or not the new_start_slurl modifies the grid. * @@ -672,7 +674,8 @@ void LLPanelLogin::onUpdateStartSLURL(const LLSLURL& new_start_slurl) updateServer(); // to change the links and splash screen } - location_combo->setTextEntry(new_start_slurl.getLocationString()); + //location_combo->setTextEntry(new_start_slurl.getLocationString()); + location_edit->setValue(new_start_slurl.getLocationString()); } else { @@ -757,7 +760,7 @@ void LLPanelLogin::loadLoginPage() // allow users (testers really) to specify a different login content URL std::string force_login_url = gSavedSettings.getString("ForceLoginURL"); - if ( force_login_url.length() ) + if ( force_login_url.length() > 0 ) { login_page = LLURI(force_login_url); } diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index ea0f7d8593..9da044ab64 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -179,46 +179,29 @@ left_pad="2" name="rating_icon_adult" width="18"/> - - Start location: - - - - - - - + + (Others using this computer will also see them) + + - -