diff options
author | callum_linden <none@none> | 2014-12-10 08:44:08 -0800 |
---|---|---|
committer | callum_linden <none@none> | 2014-12-10 08:44:08 -0800 |
commit | 23711c927561ee85b6d46e7e741cdc652649686e (patch) | |
tree | 4b8c89671594efb2241f894011f9548ae901df76 /indra/newview/llvoavatar.cpp | |
parent | 6ad2b5f8d3e4c240a48452578d5c3101a2811053 (diff) |
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-x | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 9ba0c9a4b2..d6fb6a5235 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7066,7 +7066,7 @@ void LLVOAvatar::parseAppearanceMessage(LLMessageSystem* mesgsys, LLAppearanceMe if (it != contents.mParams.end()) { S32 index = it - contents.mParams.begin(); - contents.mParamAppearanceVersion = llround(contents.mParamWeights[index]); + contents.mParamAppearanceVersion = ll_round(contents.mParamWeights[index]); LL_DEBUGS("Avatar") << "appversion req by appearance_version param: " << contents.mParamAppearanceVersion << LL_ENDL; } } |