diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-08-19 19:59:03 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-08-19 19:59:03 +0800 |
commit | 495f103000137b3288eaa05a4298fd33ceb3c2dc (patch) | |
tree | 19b79a5cb33275a874d24e923a04de7b9657401b /indra/newview/llappearancemgr.cpp | |
parent | b7a79709003b1f7f0451ba577576040fc03e50f9 (diff) | |
parent | 0f3ffb0fad721740f20ed5c7a74f4ceade6d46b6 (diff) |
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 9dd23a5319..6411be3d4f 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]); } |