diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-09-09 14:23:24 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-09-09 14:23:24 +0800 |
commit | 693137a6487e6ffda9ff15ade62d0e8bfec1bf49 (patch) | |
tree | 12c078a35bebfd139d108f5fb7cd6c7fc4455c70 /indra/newview/llautoreplace.cpp | |
parent | b9ab04cd6e253848bad865fc1b5ea993a2a060f3 (diff) | |
parent | 8a9a3dc9d760db37bb963d3e5bfadafdd94ee08d (diff) |
Merge branch '2025.06'
Diffstat (limited to 'indra/newview/llautoreplace.cpp')
-rw-r--r-- | indra/newview/llautoreplace.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llautoreplace.cpp b/indra/newview/llautoreplace.cpp index f200ca8e31..1ea2899ba4 100644 --- a/indra/newview/llautoreplace.cpp +++ b/indra/newview/llautoreplace.cpp @@ -536,11 +536,12 @@ LLAutoReplaceSettings::AddListResult LLAutoReplaceSettings::replaceList(const LL S32 search_index; LLSD targetList; // The following is working around the fact that LLSD arrays containing maps also seem to have undefined entries... see LLSD-30 - for ( search_index = 0, targetList = mLists[0]; + for ( search_index = 0; !listFound && search_index < mLists.size(); - search_index += 1, targetList = mLists[search_index] + search_index += 1 ) { + targetList = mLists[search_index]; if ( targetList.isMap() ) { if ( listNameMatches( targetList, listName) ) |