summaryrefslogtreecommitdiff
path: root/indra/llui/llbadge.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/llui/llbadge.cpp
parent6ad2b5f8d3e4c240a48452578d5c3101a2811053 (diff)
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
Diffstat (limited to 'indra/llui/llbadge.cpp')
-rwxr-xr-xindra/llui/llbadge.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llbadge.cpp b/indra/llui/llbadge.cpp
index 30cb18812b..42726de0ad 100755
--- a/indra/llui/llbadge.cpp
+++ b/indra/llui/llbadge.cpp
@@ -196,10 +196,10 @@ void renderBadgeBackground(F32 centerX, F32 centerY, F32 width, F32 height, cons
F32 x = LLFontGL::sCurOrigin.mX + centerX - width * 0.5f;
F32 y = LLFontGL::sCurOrigin.mY + centerY - height * 0.5f;
- LLRectf screen_rect(llround(x),
- llround(y),
- llround(x) + width,
- llround(y) + height);
+ LLRectf screen_rect(ll_round(x),
+ ll_round(y),
+ ll_round(x) + width,
+ ll_round(y) + height);
LLVector3 vertices[4];
vertices[0] = LLVector3(screen_rect.mRight, screen_rect.mTop, 1.0f);