diff options
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index c2922182d4..ee67f5062e 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2962,14 +2962,14 @@ void LLViewerObject::updateControlAvatar() } if (any_mesh) { - std::string vobj_name = llformat("Vol%u", (U32) root); + std::string vobj_name = llformat("Vol%p", root); LL_DEBUGS("AnimatedObjects") << vobj_name << " calling linkControlAvatar()" << LL_ENDL; root->linkControlAvatar(); } } if (!root->isAnimatedObject() && root->getControlAvatar()) { - std::string vobj_name = llformat("Vol%u", (U32) root); + std::string vobj_name = llformat("Vol%p", root); LL_DEBUGS("AnimatedObjects") << vobj_name << " calling unlinkControlAvatar()" << LL_ENDL; root->unlinkControlAvatar(); } 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; } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index dd136d2fb8..740da863af 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3355,7 +3355,7 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f LLVOVolume *vol_obj = drawablep->getVOVolume(); if (vol_obj && vol_obj->isAnimatedObject() && vol_obj->isRiggedMesh()) { - std::string vobj_name = llformat("Vol%u", (U32) vol_obj); + std::string vobj_name = llformat("Vol%p", vol_obj); F32 est_tris = vol_obj->getEstTrianglesMax(); LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " markRebuild, tris " << est_tris << " priority " << (S32) priority << " flag " << std::hex << flag << LL_ENDL; |