Merge branch 'release/2026.01' into maxim/2025.07-Flat-UI

4 files changed, 19 insertions, 13 deletions

diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 29ca903256..b82a58163c 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -123,7 +123,7 @@ void LLCredential::authenticatorType(std::string &idType)
 LLNotificationPtr LLNotificationsUtil::add(const std::string& name,
                                            const LLSD& substitutions,
                                            const LLSD& payload,
-                                           boost::function<void (const LLSD&, const LLSD&)> functor)
+                                           std::function<void (const LLSD&, const LLSD&)> functor)
 {
     return LLNotificationPtr((LLNotification*)NULL);
 }
@@ -253,7 +253,7 @@ void LLProgressView::setMessage(std::string const &){}
 // LLNotifications
 class MockNotifications : public LLNotificationsInterface
 {
-    boost::function<void (const LLSD&, const LLSD&)> mResponder;
+    std::function<void (const LLSD&, const LLSD&)> mResponder;
     int mAddedCount;
 
 public:
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index fc9f5b707a..3ff38ea372 100644
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -177,15 +177,15 @@ namespace tut
         LLSLURL slurl = LLSLURL("");
         ensure_equals("null slurl", (int)slurl.getType(), LLSLURL::LAST_LOCATION);
 
-        slurl = LLSLURL("http://slurl.com/secondlife/myregion");
+        slurl = LLSLURL("https://slurl.com/secondlife/myregion");
         ensure_equals("slurl.com slurl, region only - type", slurl.getType(), LLSLURL::LOCATION);
         ensure_equals("slurl.com slurl, region only", slurl.getSLURLString(),
-                      "http://maps.secondlife.com/secondlife/myregion/128/128/0");
+                      "https://maps.secondlife.com/secondlife/myregion/128/128/0");
 
-        slurl = LLSLURL("http://maps.secondlife.com/secondlife/myregion/1/2/3");
+        slurl = LLSLURL("https://maps.secondlife.com/secondlife/myregion/1/2/3");
         ensure_equals("maps.secondlife.com slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
         ensure_equals("maps.secondlife.com slurl, region + coords", slurl.getSLURLString(),
-                      "http://maps.secondlife.com/secondlife/myregion/1/2/3");
+                      "https://maps.secondlife.com/secondlife/myregion/1/2/3");
 
         slurl = LLSLURL("secondlife://");
         ensure_equals("secondlife: slurl, empty - type", slurl.getType(), LLSLURL::EMPTY);
@@ -196,27 +196,27 @@ namespace tut
         slurl = LLSLURL("secondlife://myregion");
         ensure_equals("secondlife: slurl, region only - type", slurl.getType(), LLSLURL::LOCATION);
         ensure_equals("secondlife: slurl, region only", slurl.getSLURLString(),
-                      "http://maps.secondlife.com/secondlife/myregion/128/128/0");
+                      "https://maps.secondlife.com/secondlife/myregion/128/128/0");
 
         slurl = LLSLURL("secondlife://myregion/1/2/3");
         ensure_equals("secondlife: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
         ensure_equals("secondlife slurl, region + coords", slurl.getSLURLString(),
-                      "http://maps.secondlife.com/secondlife/myregion/1/2/3");
+                      "https://maps.secondlife.com/secondlife/myregion/1/2/3");
 
         slurl = LLSLURL("/myregion");
         ensure_equals("/region slurl, region- type", slurl.getType(), LLSLURL::LOCATION);
         ensure_equals("/region slurl, region ", slurl.getSLURLString(),
-                      "http://maps.secondlife.com/secondlife/myregion/128/128/0");
+                      "https://maps.secondlife.com/secondlife/myregion/128/128/0");
 
         slurl = LLSLURL("/myregion/1/2/3");
         ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
         ensure_equals("/ slurl, region + coords", slurl.getSLURLString(),
-                      "http://maps.secondlife.com/secondlife/myregion/1/2/3");
+                      "https://maps.secondlife.com/secondlife/myregion/1/2/3");
 
         slurl = LLSLURL("my region/1/2/3");
         ensure_equals(" slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION);
         ensure_equals(" slurl, region + coords", slurl.getSLURLString(),
-                      "http://maps.secondlife.com/secondlife/my%20region/1/2/3");
+                      "https://maps.secondlife.com/secondlife/my%20region/1/2/3");
 
         LLGridManager::getInstance()->setGridChoice("my.grid.com");
         slurl = LLSLURL("https://my.grid.com/region/my%20region/1/2/3");
@@ -309,7 +309,7 @@ namespace tut
         slurl = LLSLURL("my region", LLVector3(1,2,3));
         ensure_equals("default grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION);
         ensure_equals(" default grid/region/vector", slurl.getSLURLString(),
-                      "http://maps.secondlife.com/secondlife/my%20region/1/2/3");
+                      "https://maps.secondlife.com/secondlife/my%20region/1/2/3");
 
         LLGridManager::getInstance()->setGridChoice("MyGrid");
         slurl = LLSLURL("my region", LLVector3(1,2,3));
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index d9cb9e7538..94cf0fcf10 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -391,7 +391,7 @@ namespace tut
                       std::string("https://minimal.long.name/helpers/"));
         ensure_equals("minimal grid login page",
                       LLGridManager::getInstance()->getLoginPage("minimal.long.name"),
-                      std::string("http://minimal.long.name/app/login/"));
+                      std::string("https://minimal.long.name/app/login/"));
 
     }
 
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
index d5bf189d82..60172b3960 100644
--- a/indra/newview/tests/llworldmap_test.cpp
+++ b/indra/newview/tests/llworldmap_test.cpp
@@ -32,6 +32,7 @@
 #include "lltrans.h"
 #include "lluistring.h"
 #include "../llviewertexture.h"
+#include "../llviewercontrol.h"
 #include "../llworldmapmessage.h"
 // Class to test
 #include "../llworldmap.h"
@@ -71,6 +72,11 @@ void LLUIString::updateResult() const { }
 void LLUIString::setArg(const std::string& , const std::string& ) { }
 void LLUIString::assign(const std::string& ) { }
 
+LLControlGroup::LLControlGroup(const std::string& name) : LLInstanceTracker<LLControlGroup, std::string>(name) {}
+LLControlGroup::~LLControlGroup() {}
+bool LLControlGroup::getBOOL(std::string_view) { return true; }
+LLControlGroup gSavedSettings("test_settings");
+
 // End Stubbing
 // -------------------------------------------------------------------------------------------