From b57ac03b395c7637be7a224ecaefe96afef2ed10 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 17 Jan 2018 17:59:01 +0000
Subject: Fix for 64-bit pointers in some llformat statements

---
 indra/newview/llviewerobject.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llviewerobject.cpp')

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();
     }
-- 
cgit v1.2.3