livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for 64-bit pointers in some llformat statements

meow-7.2.2
Brad Payne (Vir Linden) 2018-01-17 17:59:01 +00:00
parent e36745eb98
commit b57ac03b39
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerobject.cpp
View File

@ -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();
}

8
indra/newview/llvovolume.cpp
View File

@ -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;
}

2
indra/newview/pipeline.cpp
View File

@ -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;