Merge remote-tracking branch 'secondlife/release/2026.01' into 2026.01

2 files changed, 1 insertions, 194 deletions

diff --git a/indra/llmessage/tests/llareslistener_test.cpp b/indra/llmessage/tests/llareslistener_test.cpp
deleted file mode 100644
index f4a9e501ec..0000000000
--- a/indra/llmessage/tests/llareslistener_test.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * @file   llareslistener_test.cpp
- * @author Mark Palange
- * @date   2009-02-26
- * @brief  Tests of llareslistener.h.
- *
- * $LicenseInfo:firstyear=2009&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#if LL_WINDOWS
-#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally
-#endif
-
-// Precompiled header
-#include "linden_common.h"
-// associated header
-#include "../llareslistener.h"
-// STL headers
-#include <iostream>
-// std headers
-// external library headers
-#include <boost/bind.hpp>
-
-// other Linden headers
-#include "llsd.h"
-#include "llares.h"
-#include "../test/lltut.h"
-#include "llevents.h"
-#include "tests/wrapllerrs.h"
-
-/*****************************************************************************
-*   Dummy stuff
-*****************************************************************************/
-LLAres::LLAres():
-    // Simulate this much of the real LLAres constructor: we need an
-    // LLAresListener instance.
-    mListener(new LLAresListener("LLAres", this))
-{}
-LLAres::~LLAres() {}
-void LLAres::rewriteURI(const std::string &uri,
-                    LLAres::UriRewriteResponder *resp)
-{
-    // This is the only LLAres method I chose to implement.
-    // The effect is that LLAres returns immediately with
-    // a result that is equal to the input uri.
-    std::vector<std::string> result;
-    result.push_back(uri);
-    resp->rewriteResult(result);
-}
-
-LLAres::QueryResponder::~QueryResponder() {}
-void LLAres::QueryResponder::queryError(int) {}
-void LLAres::QueryResponder::queryResult(char const*, size_t) {}
-LLQueryResponder::LLQueryResponder() {}
-void LLQueryResponder::queryResult(char const*, size_t) {}
-void LLQueryResponder::querySuccess() {}
-void LLAres::UriRewriteResponder::queryError(int) {}
-void LLAres::UriRewriteResponder::querySuccess() {}
-void LLAres::UriRewriteResponder::rewriteResult(const std::vector<std::string>& uris) {}
-
-/*****************************************************************************
-*   TUT
-*****************************************************************************/
-namespace tut
-{
-    struct data
-    {
-        LLAres dummyAres;
-    };
-    typedef test_group<data> llareslistener_group;
-    typedef llareslistener_group::object object;
-    llareslistener_group llareslistenergrp("llareslistener");
-
-    struct ResponseCallback
-    {
-        std::vector<std::string> mURIs;
-        bool operator()(const LLSD& response)
-        {
-            mURIs.clear();
-            for (LLSD::array_const_iterator ri(response.beginArray()), rend(response.endArray());
-                 ri != rend; ++ri)
-            {
-                mURIs.push_back(*ri);
-            }
-            return false;
-        }
-    };
-
-    template<> template<>
-    void object::test<1>()
-    {
-        set_test_name("test event");
-        // Tests the success and failure cases, since they both use
-        // the same code paths in the LLAres responder.
-        ResponseCallback response;
-        std::string pumpname("trigger");
-        // Since we're asking LLEventPumps to obtain() the pump by the desired
-        // name, it will persist beyond the current scope, so ensure we
-        // disconnect from it when 'response' goes away.
-        LLTempBoundListener temp(
-            LLEventPumps::instance().obtain(pumpname).listen("rewriteURIresponse",
-                                                             boost::bind(&ResponseCallback::operator(), &response, _1)));
-        // Now build an LLSD request that will direct its response events to
-        // that pump.
-        const std::string testURI("login.bar.com");
-        LLSD request;
-        request["op"] = "rewriteURI";
-        request["uri"] = testURI;
-        request["reply"] = pumpname;
-        LLEventPumps::instance().obtain("LLAres").post(request);
-        ensure_equals(response.mURIs.size(), 1);
-        ensure_equals(response.mURIs.front(), testURI);
-    }
-
-    template<> template<>
-    void object::test<2>()
-    {
-        set_test_name("bad op");
-        WrapLLErrs capture;
-        LLSD request;
-        request["op"] = "foo";
-        std::string threw = capture.catch_llerrs([&request](){
-                LLEventPumps::instance().obtain("LLAres").post(request);
-            });
-        ensure_contains("LLAresListener bad op", threw, "bad");
-    }
-
-    template<> template<>
-    void object::test<3>()
-    {
-        set_test_name("bad rewriteURI request");
-        WrapLLErrs capture;
-        LLSD request;
-        request["op"] = "rewriteURI";
-        std::string threw = capture.catch_llerrs([&request](){
-                LLEventPumps::instance().obtain("LLAres").post(request);
-            });
-        ensure_contains("LLAresListener bad req", threw, "missing");
-        ensure_contains("LLAresListener bad req", threw, "reply");
-        ensure_contains("LLAresListener bad req", threw, "uri");
-    }
-
-    template<> template<>
-    void object::test<4>()
-    {
-        set_test_name("bad rewriteURI request");
-        WrapLLErrs capture;
-        LLSD request;
-        request["op"] = "rewriteURI";
-        request["reply"] = "nonexistent";
-        std::string threw = capture.catch_llerrs([&request](){
-                LLEventPumps::instance().obtain("LLAres").post(request);
-            });
-        ensure_contains("LLAresListener bad req", threw, "missing");
-        ensure_contains("LLAresListener bad req", threw, "uri");
-        ensure_does_not_contain("LLAresListener bad req", threw, "reply");
-    }
-
-    template<> template<>
-    void object::test<5>()
-    {
-        set_test_name("bad rewriteURI request");
-        WrapLLErrs capture;
-        LLSD request;
-        request["op"] = "rewriteURI";
-        request["uri"] = "foo.bar.com";
-        std::string threw = capture.catch_llerrs([&request](){
-                LLEventPumps::instance().obtain("LLAres").post(request);
-            });
-        ensure_contains("LLAresListener bad req", threw, "missing");
-        ensure_contains("LLAresListener bad req", threw, "reply");
-        ensure_does_not_contain("LLAresListener bad req", threw, "uri");
-    }
-}
diff --git a/indra/llmessage/tests/llcoproceduremanager_test.cpp b/indra/llmessage/tests/llcoproceduremanager_test.cpp
index 4caae5f082..0a77fd218b 100644
--- a/indra/llmessage/tests/llcoproceduremanager_test.cpp
+++ b/indra/llmessage/tests/llcoproceduremanager_test.cpp
@@ -48,7 +48,7 @@
 #pragma warning(disable: 4702)
 #endif
 
-LLCoreHttpUtil::HttpCoroutineAdapter::HttpCoroutineAdapter(std::string const&, unsigned int)
+LLCoreHttpUtil::HttpCoroutineAdapter::HttpCoroutineAdapter(std::string name, LLCore::HttpRequest::policy_t policyId)
 {
 }