diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-07 18:50:33 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-07 18:50:33 -0400 |
| commit | 5b58bfb937f7f996c7f1b97f15b1c837aa23a463 (patch) | |
| tree | 6dfd40478bbcf0a03e4be12d3d17c73ad161d7d2 /indra/newview | |
| parent | 74b8a487646cccb3260d02910ab5b16e274ec9ab (diff) | |
SL-234 WIP - mac build fix
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/lldrawpoolavatar.cpp | 2 |
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 |