From 5b58bfb937f7f996c7f1b97f15b1c837aa23a463 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 7 Oct 2015 18:50:33 -0400
Subject: SL-234 WIP - mac build fix
---
indra/newview/lldrawpoolavatar.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 5d78132f6d..e8f53e0f3d 100755
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1546,7 +1546,7 @@ U32 LLDrawPoolAvatar::getMaxJointCount()
// static
U32 LLDrawPoolAvatar::getMeshJointCount(const LLMeshSkinInfo *skin)
{
- return llmin(getMaxJointCount(), skin->mJointNames.size());
+ return llmin((U32)getMaxJointCount(), (U32)skin->mJointNames.size());
}
// static
--
cgit v1.2.3