From c785a0e955478dcad867af55bcd44111a718aefd Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Wed, 1 May 2024 08:22:19 -0700
Subject: Add editorconfig

Provide a basic editorconfig file with this repository's defaults.
---
 .editorconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..9ac24be468
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+
+[*.{yml,yaml}]
+indent_size = 2
-- 
cgit v1.2.3


From d5378e9cab2024237b4d900057ba59f7f22f4594 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 9 May 2024 01:54:03 +0300
Subject: viewer-private#236 Don't block removal of marketplace folders

Marketplace is not visible outside of own floater and that floater will
do an extra warning when deleting listings that have additional data.
---
 indra/newview/llinventoryfunctions.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index c8aa235506..016b0880eb 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -843,12 +843,6 @@ bool get_is_category_and_children_removable(LLInventoryModel* model, const LLUUI
         return false;
     }
 
-    const LLUUID mp_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
-    if (mp_id.notNull() && gInventory.isObjectDescendentOf(folder_id, mp_id))
-    {
-        return false;
-    }
-
     LLInventoryModel::cat_array_t cat_array;
     LLInventoryModel::item_array_t item_array;
     model->collectDescendents(
-- 
cgit v1.2.3


From 2c52f6e323c0917fe61ab0a247dddd9df89414c6 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Mon, 13 May 2024 18:06:18 +0300
Subject: #1457 Temporarily disable the tests to unblock Maint X builds

This reverts commit 4329e95379173a304e91dd0b7513e936aeded380.
---
 build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.sh b/build.sh
index e025b73170..46a287ea32 100755
--- a/build.sh
+++ b/build.sh
@@ -178,7 +178,6 @@ pre_build()
 
     "$autobuild" configure --quiet -c $variant \
      ${eval_autobuild_configure_parameters:---} \
-     -DLL_TESTS:BOOL=ON \
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
-- 
cgit v1.2.3


From 82d713782529074b03720833038cb0df2b8bcffd Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 14 May 2024 08:50:04 +0300
Subject: #1457 Fix the tests on mac

---
 build.sh                                   | 1 +
 indra/llimage/tests/llimageworker_test.cpp | 3 ++-
 indra/test/test.cpp                        | 6 ------
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index 46a287ea32..e025b73170 100755
--- a/build.sh
+++ b/build.sh
@@ -178,6 +178,7 @@ pre_build()
 
     "$autobuild" configure --quiet -c $variant \
      ${eval_autobuild_configure_parameters:---} \
+     -DLL_TESTS:BOOL=ON \
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index 49fc1afd82..2568adf89e 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -68,6 +68,7 @@ U8* LLImageRaw::allocateData(S32 size) { return NULL; }
 U8* LLImageRaw::reallocateData(S32 size) { return NULL; }
 const U8* LLImageBase::getData() const { return NULL; }
 U8* LLImageBase::getData() { return NULL; }
+const std::string& LLImage::getLastThreadError() { static std::string msg; return msg; }
 
 // End Stubbing
 // -------------------------------------------------------------------------------------------
@@ -98,7 +99,7 @@ namespace tut
                 done = res;
                 *done = false;
             }
-            virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux, U32)
+            virtual void completed(bool success, const std::string& error_message, LLImageRaw* raw, LLImageRaw* aux, U32 request_id)
             {
                 *done = true;
             }
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index 21232e88f5..61a4eb07c5 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -54,12 +54,6 @@
 #endif
 
 #ifndef LL_WINDOWS
-
-typedef struct {
-  void *re_pcre;
-  size_t re_nsub;
-  size_t re_erroffset;
-} regex_t;
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #endif
-- 
cgit v1.2.3