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(-)
(limited to 'indra')
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 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
---
indra/llimage/tests/llimageworker_test.cpp | 3 ++-
indra/test/test.cpp | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)
(limited to 'indra')
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