summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/lldrawpoolavatar.cpp2
1 files changed, 1 insertions, 1 deletions
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