Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop

 # Conflicts:
 #	.github/workflows/build.yaml
 #	indra/llui/llscrolllistctrl.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index a808c196c7..66082d317a 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2133,11 +2133,11 @@ void LLAppearanceMgr::filterWearableItems(
         items.clear();
         for (S32 i=0; i<LLWearableType::WT_COUNT; i++)
         {
-            auto size = items_by_type[i].size();
+            S32 size = (S32)items_by_type[i].size();
             if (size <= 0)
                 continue;
-            auto start_index = llmax(0,size-max_per_type);
-            for (size_t j = start_index; j<size; j++)
+            S32 start_index = llmax(0,size-max_per_type);
+            for (S32 j = start_index; j<size; j++)
             {
                 items.push_back(items_by_type[i][j]);
             }