summaryrefslogtreecommitdiff
path: root/indra/llui/llprogressbar.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/llprogressbar.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/llprogressbar.cpp')
-rwxr-xr-xindra/llui/llprogressbar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llprogressbar.cpp b/indra/llui/llprogressbar.cpp
index 84a890edfa..209796565c 100755
--- a/indra/llui/llprogressbar.cpp
+++ b/indra/llui/llprogressbar.cpp
@@ -77,7 +77,7 @@ void LLProgressBar::draw()
LLColor4 bar_color = mColorBar.get();
bar_color.mV[VALPHA] *= alpha; // modulate alpha
LLRect progress_rect = getLocalRect();
- progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f));
+ progress_rect.mRight = ll_round(getRect().getWidth() * (mPercentDone / 100.f));
mImageFill->draw(progress_rect, bar_color);
}