diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-07-11 17:30:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-11 17:30:01 -0700 |
| commit | d6734b7e2e2d4316674f6e32ee9ed514618ed440 (patch) | |
| tree | 6aab97476709b71bcf76f5ee30af29310c8f317b /indra/llmath | |
| parent | ba4b596894e8eb9b9eb51169b9b3f88c21173c29 (diff) | |
| parent | 59a626c2a22aa7cbccf87ce435012583d7610cd4 (diff) | |
Merge pull request #270 from secondlife/SL-19992
SL-19992: Fix LOD assert
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llvolumemgr.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/llmath/llvolumemgr.cpp b/indra/llmath/llvolumemgr.cpp index 89cdb1c6b9..9399504529 100644 --- a/indra/llmath/llvolumemgr.cpp +++ b/indra/llmath/llvolumemgr.cpp @@ -89,7 +89,7 @@ BOOL LLVolumeMgr::cleanup() // Note however that LLVolumeLODGroup that contains the volume // also holds a LLPointer so the volume will only go away after // anything holding the volume and the LODGroup are destroyed -LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32 detail) +LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32 lod) { LLVolumeLODGroup* volgroupp; if (mDataMutex) @@ -109,7 +109,7 @@ LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32 { mDataMutex->unlock(); } - return volgroupp->refLOD(detail); + return volgroupp->refLOD(lod); } // virtual @@ -287,18 +287,18 @@ bool LLVolumeLODGroup::cleanupRefs() return res; } -LLVolume* LLVolumeLODGroup::refLOD(const S32 detail) +LLVolume* LLVolumeLODGroup::refLOD(const S32 lod) { - llassert(detail >=0 && detail < NUM_LODS); - mAccessCount[detail]++; + llassert(lod >=0 && lod < NUM_LODS); + mAccessCount[lod]++; mRefs++; - if (mVolumeLODs[detail].isNull()) + if (mVolumeLODs[lod].isNull()) { - mVolumeLODs[detail] = new LLVolume(mVolumeParams, mDetailScales[detail]); + mVolumeLODs[lod] = new LLVolume(mVolumeParams, mDetailScales[lod]); } - mLODRefs[detail]++; - return mVolumeLODs[detail]; + mLODRefs[lod]++; + return mVolumeLODs[lod]; } BOOL LLVolumeLODGroup::derefLOD(LLVolume *volumep) |