From b89227190b3f8666ee988b38f48f9b08e620bc13 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 27 Sep 2017 22:31:19 +0200 Subject: [PATCH 1/4] Fix EOL --- indra/newview/app_settings/settings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 165b79e20c..b88789ada6 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1760,13 +1760,13 @@ AssetFetchConcurrency - Comment - Maximum number of HTTP connections used for asset fetches - Persist - 1 - Type - U32 - Value + Comment + Maximum number of HTTP connections used for asset fetches + Persist + 1 + Type + U32 + Value 0 AuctionShowFence From 4a008b020325181be94f16e9b218056e1820e8ef Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 28 Sep 2017 20:19:33 +0200 Subject: [PATCH 2/4] Transplant MAINT-7835 Start location is not changed correctly via 'maps.secondlife.com' link in some cases --- indra/newview/fspanellogin.cpp | 12 +++++++++--- indra/newview/fspanellogin.h | 4 ++++ indra/newview/llstartup.cpp | 11 +++++++---- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp index 2690b69fbe..add21b67bf 100644 --- a/indra/newview/fspanellogin.cpp +++ b/indra/newview/fspanellogin.cpp @@ -82,6 +82,7 @@ const S32 MAX_PASSWORD_OPENSIM = 255; FSPanelLogin *FSPanelLogin::sInstance = NULL; BOOL FSPanelLogin::sCapslockDidNotification = FALSE; +BOOL FSPanelLogin::sCredentialSet = FALSE; std::string FSPanelLogin::sPassword = ""; // Helper for converting a user name into the canonical "Firstname Lastname" form. @@ -187,6 +188,7 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect, setBackgroundOpaque(TRUE); mPasswordModified = FALSE; + FSPanelLogin::sInstance = this; LLView* login_holder = gViewerWindow->getLoginPanelHolder(); @@ -463,6 +465,7 @@ void FSPanelLogin::setFields(LLPointer credential, bool from_start LL_WARNS() << "Attempted setFields with no login view shown" << LL_ENDL; return; } + sCredentialSet = TRUE; LL_INFOS("Credentials") << "Setting login fields to " << *credential << LL_ENDL; std::string login_id; @@ -727,9 +730,12 @@ void FSPanelLogin::onUpdateStartSLURL(const LLSLURL& new_start_slurl) updateServer(); // to change the links and splash screen } - location_combo->setTextEntry(new_start_slurl.getLocationString()); - sInstance->mLocationLength = new_start_slurl.getLocationString().length(); - sInstance->updateLoginButtons(); + if ( new_start_slurl.getLocationString().length() ) + { + location_combo->setTextEntry(new_start_slurl.getLocationString()); + sInstance->mLocationLength = new_start_slurl.getLocationString().length(); + sInstance->updateLoginButtons(); + } } else { diff --git a/indra/newview/fspanellogin.h b/indra/newview/fspanellogin.h index 656e6654b5..9941d8171f 100644 --- a/indra/newview/fspanellogin.h +++ b/indra/newview/fspanellogin.h @@ -58,6 +58,8 @@ public: static void getFields(LLPointer& credential, BOOL& remember); + static BOOL isCredentialSet() { return sCredentialSet; } + static BOOL areCredentialFieldsDirty(); static void setLocation(const LLSLURL& slurl); static void autologinToLocation(const LLSLURL& slurl); @@ -122,6 +124,8 @@ private: static FSPanelLogin* sInstance; static BOOL sCapslockDidNotification; + static BOOL sCredentialSet; + unsigned int mUsernameLength; unsigned int mPasswordLength; unsigned int mLocationLength; diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 7c62e656f3..1a76f505ae 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1132,13 +1132,16 @@ bool idle_startup() // Show the login dialog login_show(); // connect dialog is already shown, so fill in the names - if (gUserCredential.notNull()) + // + //if (gUserCredential.notNull() && !LLPanelLogin::isCredentialSet()) + //{ + // LLPanelLogin::setFields( gUserCredential, gRememberPassword); + //} + if (gUserCredential.notNull() && !FSPanelLogin::isCredentialSet()) { -// - //LLPanelLogin::setFields( gUserCredential, gRememberPassword); FSPanelLogin::setFields(gUserCredential, true); -// } + // // [FS Login Panel] //LLPanelLogin::giveFocus(); FSPanelLogin::giveFocus(); From c67e51196046a299975eb0ebb2c2a4bc4e56542a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 29 Sep 2017 15:34:21 +0200 Subject: [PATCH 3/4] Transplant MAINT-7835 FIXED issue with resetting username after failed attempt to login --- indra/newview/fspanellogin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp index add21b67bf..b32b2025b5 100644 --- a/indra/newview/fspanellogin.cpp +++ b/indra/newview/fspanellogin.cpp @@ -914,6 +914,7 @@ void FSPanelLogin::onClickConnect(void *) } else { + sCredentialSet = FALSE; LLPointer cred; BOOL remember; getFields(cred, remember); From 8066bd5f1f74a00afe526386d596ec2827676b9e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 29 Sep 2017 23:39:16 +0200 Subject: [PATCH 4/4] Stop shouting! --- indra/newview/skins/default/xui/en/floater_linkreplace.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/floater_linkreplace.xml b/indra/newview/skins/default/xui/en/floater_linkreplace.xml index ece75e2576..1c37a408e8 100644 --- a/indra/newview/skins/default/xui/en/floater_linkreplace.xml +++ b/indra/newview/skins/default/xui/en/floater_linkreplace.xml @@ -3,7 +3,7 @@ name="linkreplace" help_topic="linkreplace" positioning="centered" - title="REPLACE INVENTORY LINKS" + title="Replace Inventory Links" width="333" height="130" save_rect="true"