summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertextureanim.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-12-10 08:44:08 -0800
committercallum_linden <none@none>2014-12-10 08:44:08 -0800
commit23711c927561ee85b6d46e7e741cdc652649686e (patch)
tree4b8c89671594efb2241f894011f9548ae901df76 /indra/newview/llviewertextureanim.cpp
parent6ad2b5f8d3e4c240a48452578d5c3101a2811053 (diff)
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
Diffstat (limited to 'indra/newview/llviewertextureanim.cpp')
-rwxr-xr-xindra/newview/llviewertextureanim.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertextureanim.cpp b/indra/newview/llviewertextureanim.cpp
index 2b364851a7..9af92d7377 100755
--- a/indra/newview/llviewertextureanim.cpp
+++ b/indra/newview/llviewertextureanim.cpp
@@ -179,7 +179,7 @@ S32 LLViewerTextureAnim::animateTextures(F32 &off_s, F32 &off_t,
if (!(mMode & SMOOTH))
{
- frame_counter = (F32)llround(frame_counter);
+ frame_counter = (F32)ll_round(frame_counter);
}
//