diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
| commit | 290f2f05f7c2c061ba82f83594e4f7fb6a043ced (patch) | |
| tree | 648819527f93c4b398aaace5fb456afc983c2b15 /indra/llmath/llvolumemgr.cpp | |
| parent | 810a0b3dcee41ec657c94ccb26003b9b4e20e141 (diff) | |
svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release
Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
Diffstat (limited to 'indra/llmath/llvolumemgr.cpp')
| -rw-r--r-- | indra/llmath/llvolumemgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolumemgr.cpp b/indra/llmath/llvolumemgr.cpp index 23ed0183b8..c4f10467a9 100644 --- a/indra/llmath/llvolumemgr.cpp +++ b/indra/llmath/llvolumemgr.cpp @@ -115,7 +115,7 @@ LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32 { mDataMutex->unlock(); } - return volgroupp->getLODVolume(detail); + return volgroupp->refLOD(detail); } // virtual @@ -294,7 +294,7 @@ bool LLVolumeLODGroup::cleanupRefs() return res; } -LLVolume* LLVolumeLODGroup::getLODVolume(const S32 detail) +LLVolume* LLVolumeLODGroup::refLOD(const S32 detail) { llassert(detail >=0 && detail < NUM_LODS); mAccessCount[detail]++; |