diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:38:06 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:38:06 -0400 |
commit | 041005f2860808bb807483775635abcd8c54fecf (patch) | |
tree | 57cce285218550dd2c0378ac8bf0c1c1d856701e /indra/llmath/llvolume.cpp | |
parent | 1be9d68468e51be7de5b632f0276dc6708e75dc6 (diff) | |
parent | b61ea595b5f2cac0f108b05526f0a371f512bfd4 (diff) |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
Diffstat (limited to 'indra/llmath/llvolume.cpp')
-rw-r--r-- | indra/llmath/llvolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 281f1bd87a..3b586d721f 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2416,7 +2416,7 @@ bool LLVolume::unpackVolumeFacesInternal(const LLSD& mdl) mVolumeFaces.resize(face_count); - for (U32 i = 0; i < face_count; ++i) + for (size_t i = 0; i < face_count; ++i) { LLVolumeFace& face = mVolumeFaces[i]; @@ -5482,14 +5482,14 @@ bool LLVolumeFace::cacheOptimize() new_indices.push_back(tri->mVertex[2]->mIdx); tri->complete(); - U32 breaks = 0; + //U32 breaks = 0; for (U32 i = 1; i < mNumIndices/3; ++i) { cache.updateScores(); tri = cache.mBestTriangle; if (!tri) { - breaks++; + //breaks++; for (U32 j = 0; j < triangle_data.size(); ++j) { if (triangle_data[j].mActive) |