aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmath/llvolumemgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmath/llvolumemgr.cpp')
-rw-r--r--linden/indra/llmath/llvolumemgr.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp
index 0b5464c..a3cd6b5 100644
--- a/linden/indra/llmath/llvolumemgr.cpp
+++ b/linden/indra/llmath/llvolumemgr.cpp
@@ -115,7 +115,7 @@ LLVolume* LLVolumeMgr::refVolume(const LLVolumeParams &volume_params, const S32
115 { 115 {
116 mDataMutex->unlock(); 116 mDataMutex->unlock();
117 } 117 }
118 return volgroupp->getLODVolume(detail); 118 return volgroupp->refLOD(detail);
119} 119}
120 120
121// virtual 121// virtual
@@ -294,7 +294,7 @@ bool LLVolumeLODGroup::cleanupRefs()
294 return res; 294 return res;
295} 295}
296 296
297LLVolume* LLVolumeLODGroup::getLODVolume(const S32 detail) 297LLVolume* LLVolumeLODGroup::refLOD(const S32 detail)
298{ 298{
299 llassert(detail >=0 && detail < NUM_LODS); 299 llassert(detail >=0 && detail < NUM_LODS);
300 mAccessCount[detail]++; 300 mAccessCount[detail]++;
@@ -376,7 +376,6 @@ F32 LLVolumeLODGroup::getVolumeScaleFromDetail(const S32 detail)
376 376
377F32 LLVolumeLODGroup::dump() 377F32 LLVolumeLODGroup::dump()
378{ 378{
379 char dump_str[255]; /* Flawfinder: ignore */
380 F32 usage = 0.f; 379 F32 usage = 0.f;
381 for (S32 i = 0; i < NUM_LODS; i++) 380 for (S32 i = 0; i < NUM_LODS; i++)
382 { 381 {
@@ -387,7 +386,7 @@ F32 LLVolumeLODGroup::dump()
387 } 386 }
388 usage = usage / (F32)NUM_LODS; 387 usage = usage / (F32)NUM_LODS;
389 388
390 snprintf(dump_str, sizeof(dump_str), "%.3f %d %d %d %d", usage, mAccessCount[0], mAccessCount[1], mAccessCount[2], mAccessCount[3]); /* Flawfinder: ignore */ 389 std::string dump_str = llformat("%.3f %d %d %d %d", usage, mAccessCount[0], mAccessCount[1], mAccessCount[2], mAccessCount[3]);
391 390
392 llinfos << dump_str << llendl; 391 llinfos << dump_str << llendl;
393 return usage; 392 return usage;