diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:26:34 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:26:34 +0300 |
| commit | d82d5c357a98745d265a839dd0242ec8a4994e86 (patch) | |
| tree | ac61ed5c7e676e438a80bedd3f14f41fa7f35975 /indra/newview/llautoreplace.cpp | |
| parent | 56101002a460ecd9bb7a264d55b6f8ecb9a348a0 (diff) | |
| parent | bd9add8fc77d7f39cb7c81972f72adbc3e6b5464 (diff) | |
Merge commit 'bd9add8fc7' into marchcat/c-develop
# Conflicts:
# autobuild.xml
# indra/llui/llmodaldialog.cpp
# indra/newview/llfloatermyenvironment.cpp
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/tests/llviewerassetstats_test.cpp
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) ) |