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/pipeline.cpp | |
| parent | e36745eb986ec9dd04c7f4f6d7a7249b7d5286a2 (diff) | |
Fix for 64-bit pointers in some llformat statements
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |