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