From a40fefa4f4129411c687c7e226c5296220a98ef3 Mon Sep 17 00:00:00 2001 From: Beq Date: Wed, 28 May 2025 23:48:10 +0100 Subject: [PATCH 01/56] Avoid disabling http pipelining when http 200 response arrives. --- indra/llcorehttp/_httplibcurl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp index 4988e1e4c0..896ac1c6d8 100644 --- a/indra/llcorehttp/_httplibcurl.cpp +++ b/indra/llcorehttp/_httplibcurl.cpp @@ -432,7 +432,8 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode } if (!bFailed && (op->mReqOffset || op->mReqLength)) { - if (op->mReqOffset != op->mReplyOffset || (op->mReqLength && op->mReqLength < op->mReplyLength)) + // We should only check the offset and length if we are handling a partial content request. + if (op->mStatus == HttpStatus(HTTP_PARTIAL_CONTENT) && op->mReqOffset != op->mReplyOffset || (op->mReqLength && op->mReqLength < op->mReplyLength)) { std::stringstream strm; strm << "HTTP pipelining possibly out of sync, request wanted: " << op->mReqOffset << "-"; From 4d815c65ff0f78c7cdbdec4b8f9ef5384d3bd079 Mon Sep 17 00:00:00 2001 From: Beq Date: Wed, 28 May 2025 23:49:24 +0100 Subject: [PATCH 02/56] Lots of extra debug for LL mfa black screen issue. --- indra/newview/lllogininstance.cpp | 55 +++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index f29bc9782b..3b5ed6ec68 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -254,6 +254,16 @@ void LLLoginInstance::constructAuthParams(LLPointer user_credentia } std::string mfa_hash = gSavedSettings.getString("MFAHash"); //non-persistent to enable testing + // add some debug output for mfa_hash + if (mfa_hash.empty()) + { + LL_DEBUGS("MFA") << "MFA hash from settings is empty (expected)" << LL_ENDL; + } + else + { + LL_DEBUGS("MFA") << "MFA hash from settings is set to: " << mfa_hash << LL_ENDL; + } + // std::string grid(LLGridManager::getInstance()->getGridId()); std::string user_id = user_credential->userID(); if (gSecAPIHandler) @@ -266,9 +276,20 @@ void LLLoginInstance::constructAuthParams(LLPointer user_credentia { mfa_hash = data_map[user_id].asString(); } + // add some debug output for mfa_hash + if (mfa_hash.empty()) + { + LL_DEBUGS("MFA") << "MFA hash from secuire store is empty" << LL_ENDL; + } + else + { + LL_DEBUGS("MFA") << "MFA hash is from secure store set to: " << mfa_hash << LL_ENDL; + } + // } else { + LL_DEBUGS("MFA") << "MFA hash written to protected map" << LL_ENDL; // add some debug output for mfa_hash // SL-16888 the mfa_hash is being overridden for testing so save it for consistency for future login requests gSecAPIHandler->addToProtectedMap("mfa_hash", grid, user_id, mfa_hash); } @@ -277,8 +298,8 @@ void LLLoginInstance::constructAuthParams(LLPointer user_credentia { LL_WARNS() << "unable to access protected store for mfa_hash" << LL_ENDL; } - request_params["mfa_hash"] = mfa_hash; + LL_DEBUGS("MFA") << "mfa_hash in request params is set to: " << request_params["mfa_hash"] << LL_ENDL; // add some debug output for mfa_hash // Specify desired timeout/retry options LLSD http_params; @@ -622,17 +643,47 @@ void LLLoginInstance::saveMFAHash(LLSD const& response) { std::string grid(LLGridManager::getInstance()->getGridId()); std::string user_id(LLStartUp::getUserId()); - // Only save mfa_hash for future logins if the user wants their info remembered. + // add some debug output for mfa_hash + LL_DEBUGS("MFA") << "In saveMFAHagsh, grid: " << grid + << ", user_id: " << user_id + << ", remember user: " << (gSavedSettings.getBOOL("RememberUser")? "true" : "false") + << ", saveMFA: " << (LLLoginInstance::getInstance()->saveMFA()? "true" : "false") + << LL_ENDL; + if (response.has("mfa_hash")) + { + LL_DEBUGS("MFA") << "In saveMFAHash, mfa_hash: " << response["mfa_hash"].asString() + << LL_ENDL; + } + else + { + LL_DEBUGS("MFA") << "In saveMFAHash, no mfa_hash in response" + << LL_ENDL; + } + // if (response.has("mfa_hash") && gSavedSettings.getBOOL("RememberUser") && LLLoginInstance::getInstance()->saveMFA()) { + // add some debug output for mfa_hash + LL_DEBUGS("MFA") << "In saveMFAHash, mfa_hash: " << response["mfa_hash"].asString() + << LL_ENDL; + // gSecAPIHandler->addToProtectedMap("mfa_hash", grid, user_id, response["mfa_hash"]); } else if (!LLLoginInstance::getInstance()->saveMFA()) { + // add some debug output for mfa_hash + LL_DEBUGS("MFA") << "In saveMFAHash, removing mfa_hash from protected map" + << LL_ENDL; + + // User does not want to save mfa_hash, remove it from the protected map gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid, user_id); } + // TODO(brad) - related to SL-17223 consider building a better interface that sync's automatically + // add some debug output for mfa_hash + LL_DEBUGS("MFA") << "In saveMFAHash, syncing protected map" + << LL_ENDL; + gSecAPIHandler->syncProtectedMap(); } From f1a96d74e5f4336adabdfa507fd43cb4c809106d Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 29 May 2025 00:48:13 +0100 Subject: [PATCH 03/56] Fix potentially ambiguous conditionals --- indra/llcorehttp/_httplibcurl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp index 896ac1c6d8..4cf482f8b7 100644 --- a/indra/llcorehttp/_httplibcurl.cpp +++ b/indra/llcorehttp/_httplibcurl.cpp @@ -433,7 +433,7 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode if (!bFailed && (op->mReqOffset || op->mReqLength)) { // We should only check the offset and length if we are handling a partial content request. - if (op->mStatus == HttpStatus(HTTP_PARTIAL_CONTENT) && op->mReqOffset != op->mReplyOffset || (op->mReqLength && op->mReqLength < op->mReplyLength)) + if ((op->mStatus == HttpStatus(HTTP_PARTIAL_CONTENT)) && (op->mReqOffset != op->mReplyOffset) || (op->mReqLength && op->mReqLength < op->mReplyLength)) { std::stringstream strm; strm << "HTTP pipelining possibly out of sync, request wanted: " << op->mReqOffset << "-"; From 05d02a8fffdae38e0d3f37eae94566fdde60ac3e Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 29 May 2025 00:53:32 +0100 Subject: [PATCH 04/56] Uhm let's actually fix it this time. --- indra/llcorehttp/_httplibcurl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp index 4cf482f8b7..2be9d03e47 100644 --- a/indra/llcorehttp/_httplibcurl.cpp +++ b/indra/llcorehttp/_httplibcurl.cpp @@ -433,7 +433,7 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode if (!bFailed && (op->mReqOffset || op->mReqLength)) { // We should only check the offset and length if we are handling a partial content request. - if ((op->mStatus == HttpStatus(HTTP_PARTIAL_CONTENT)) && (op->mReqOffset != op->mReplyOffset) || (op->mReqLength && op->mReqLength < op->mReplyLength)) + if ((op->mStatus == HttpStatus(HTTP_PARTIAL_CONTENT)) && ((op->mReqOffset != op->mReplyOffset) || (op->mReqLength && op->mReqLength < op->mReplyLength))) { std::stringstream strm; strm << "HTTP pipelining possibly out of sync, request wanted: " << op->mReqOffset << "-"; From 7cf7400cfe4e05385697356cccbf07315670fde9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 29 May 2025 13:22:16 +0200 Subject: [PATCH 05/56] Reduce braces spam --- indra/llcorehttp/_httplibcurl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp index 2be9d03e47..b42fe865e7 100644 --- a/indra/llcorehttp/_httplibcurl.cpp +++ b/indra/llcorehttp/_httplibcurl.cpp @@ -433,7 +433,7 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode if (!bFailed && (op->mReqOffset || op->mReqLength)) { // We should only check the offset and length if we are handling a partial content request. - if ((op->mStatus == HttpStatus(HTTP_PARTIAL_CONTENT)) && ((op->mReqOffset != op->mReplyOffset) || (op->mReqLength && op->mReqLength < op->mReplyLength))) + if (op->mStatus == HttpStatus(HTTP_PARTIAL_CONTENT) && (op->mReqOffset != op->mReplyOffset || (op->mReqLength && op->mReqLength < op->mReplyLength))) { std::stringstream strm; strm << "HTTP pipelining possibly out of sync, request wanted: " << op->mReqOffset << "-"; From 98cd425c9c6cd453fe6a4336e77a356310fc4e42 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 29 May 2025 15:31:57 +0200 Subject: [PATCH 06/56] =?UTF-8?q?FIRE-35569=20Chinese=20Translation=20Upda?= =?UTF-8?q?te,=20by=20=E5=B0=8F=E6=BB=A2=20Zi=20Ying,=20plus=20Polish=20ad?= =?UTF-8?q?justments=20for=20Vintage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/xui/zh/floater_fs_area_search.xml | 2 +- .../zh/floater_fs_contact_set_configuration.xml | 10 +++++----- .../skins/default/xui/zh/floater_phototools.xml | 16 ++++++++-------- .../zh/floater_preferences_graphics_advanced.xml | 2 +- .../xui/zh/floater_profile_permissions.xml | 2 +- .../skins/default/xui/zh/floater_world_map.xml | 4 ++-- .../default/xui/zh/menu_fs_contacts_friends.xml | 2 +- .../zh/menu_fs_contacts_friends_multiselect.xml | 2 +- .../default/xui/zh/menu_gallery_inventory.xml | 2 +- .../newview/skins/default/xui/zh/menu_viewer.xml | 2 +- .../skins/default/xui/zh/notifications.xml | 16 ++++++++-------- .../default/xui/zh/panel_fs_contacts_friends.xml | 4 ++-- .../xui/zh/panel_fs_performance_autotune.xml | 2 +- .../skins/default/xui/zh/panel_people.xml | 2 +- .../xui/zh/panel_performance_autotune.xml | 2 +- .../default/xui/zh/panel_preferences_backup.xml | 2 +- .../default/xui/zh/panel_preferences_privacy.xml | 4 ++-- .../default/xui/zh/panel_profile_secondlife.xml | 6 +++--- indra/newview/skins/default/xui/zh/strings.xml | 4 ++-- .../skins/default/xui/zh/widgets/person_view.xml | 2 +- .../skins/vintage/xui/pl/panel_profile_pick.xml | 1 + .../vintage/xui/pl/panel_profile_secondlife.xml | 1 + .../skins/vintage/xui/zh/panel_profile_pick.xml | 1 + .../vintage/xui/zh/panel_profile_secondlife.xml | 5 +++-- 24 files changed, 50 insertions(+), 46 deletions(-) diff --git a/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml b/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml index c735dd248d..5453f9ca22 100644 --- a/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml +++ b/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml @@ -62,7 +62,7 @@ - + 和 diff --git a/indra/newview/skins/default/xui/zh/floater_fs_contact_set_configuration.xml b/indra/newview/skins/default/xui/zh/floater_fs_contact_set_configuration.xml index 0543773fcc..cfdf482072 100644 --- a/indra/newview/skins/default/xui/zh/floater_fs_contact_set_configuration.xml +++ b/indra/newview/skins/default/xui/zh/floater_fs_contact_set_configuration.xml @@ -18,12 +18,12 @@ - 線上通知： + 在線通知： - - - - + + + + 自訂顏色： diff --git a/indra/newview/skins/default/xui/zh/floater_phototools.xml b/indra/newview/skins/default/xui/zh/floater_phototools.xml index 1ffdd7c434..56dade2a14 100644 --- a/indra/newview/skins/default/xui/zh/floater_phototools.xml +++ b/indra/newview/skins/default/xui/zh/floater_phototools.xml @@ -52,7 +52,7 @@ - + 反射细节 @@ -60,7 +60,7 @@ - + 反射覆盖 @@ -300,7 +300,7 @@ 最大化身數 + + Post as: + + + + Date: Sat, 7 Jun 2025 01:04:53 +0100 Subject: [PATCH 53/56] Primfeed tweak to stop button clipping into notification panel --- indra/newview/skins/default/xui/en/floater_primfeed.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_primfeed.xml b/indra/newview/skins/default/xui/en/floater_primfeed.xml index c75d48bc59..7900e2e31c 100644 --- a/indra/newview/skins/default/xui/en/floater_primfeed.xml +++ b/indra/newview/skins/default/xui/en/floater_primfeed.xml @@ -10,10 +10,10 @@ single_instance="true" reuse_instance="true" title="Share to Primfeed" - height="630" + height="638" width="272"> Date: Sat, 7 Jun 2025 15:10:49 +0200 Subject: [PATCH 54/56] Updated Polish translation --- indra/newview/skins/default/xui/pl/panel_primfeed_photo.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/newview/skins/default/xui/pl/panel_primfeed_photo.xml b/indra/newview/skins/default/xui/pl/panel_primfeed_photo.xml index 603ead08a2..5868be2b9d 100644 --- a/indra/newview/skins/default/xui/pl/panel_primfeed_photo.xml +++ b/indra/newview/skins/default/xui/pl/panel_primfeed_photo.xml @@ -15,6 +15,10 @@