diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-01-17 17:59:01 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-01-17 17:59:01 +0000 |
| commit | b57ac03b395c7637be7a224ecaefe96afef2ed10 (patch) | |
| tree | 0c0a5ea7349e3f8177a7b93174ce3b0f1b355dd3 /indra/newview/llvovolume.cpp | |
| parent | e36745eb986ec9dd04c7f4f6d7a7249b7d5286a2 (diff) | |
Fix for 64-bit pointers in some llformat statements
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 588f57576e..a6b70fe2be 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1356,7 +1356,7 @@ BOOL LLVOVolume::updateLOD() { if (isAnimatedObject() && isRiggedMesh()) { - std::string vobj_name = llformat("Vol%u", (U32) this); + std::string vobj_name = llformat("Vol%p", this); F32 est_tris = getEstTrianglesMax(); LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " updateLOD to " << getLOD() << ", tris " << est_tris << LL_ENDL; } @@ -4066,7 +4066,7 @@ void LLVOVolume::markForUpdate(BOOL priority) { if (isAnimatedObject() && isRiggedMesh()) { - std::string vobj_name = llformat("Vol%u", (U32) this); + std::string vobj_name = llformat("Vol%p", this); F32 est_tris = getEstTrianglesMax(); LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " markForUpdate, tris " << est_tris << LL_ENDL; } @@ -5003,7 +5003,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group) continue; } - std::string vobj_name = llformat("Vol%u", (U32) vobj); + std::string vobj_name = llformat("Vol%p", vobj); if (vobj->isMesh() && ((vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded()) || !gMeshRepo.meshRezEnabled())) @@ -5533,7 +5533,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group) { if (vobj->isAnimatedObject() && vobj->isRiggedMesh()) { - std::string vobj_name = llformat("Vol%u", (U32) vobj); + std::string vobj_name = llformat("Vol%p", vobj); F32 est_tris = vobj->getEstTrianglesMax(); LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " rebuildMesh, tris " << est_tris << LL_ENDL; } |