From 23711c927561ee85b6d46e7e741cdc652649686e Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 10 Dec 2014 08:44:08 -0800
Subject: Rename llround(..) to ll_round(..) because of a collision with MS
 llround (long long round) in VS2013

---
 indra/llui/lltimectrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/lltimectrl.cpp')

diff --git a/indra/llui/lltimectrl.cpp b/indra/llui/lltimectrl.cpp
index 271947db7a..516057f8fd 100755
--- a/indra/llui/lltimectrl.cpp
+++ b/indra/llui/lltimectrl.cpp
@@ -153,7 +153,7 @@ U32 LLTimeCtrl::getMinutes() const
 void LLTimeCtrl::setTime24(F32 time)
 {
 	time = llclamp(time, 0.0f, 23.99f); // fix out of range values
-	mTime = llround(time * MINUTES_PER_HOUR); // fixes values like 4.99999
+	mTime = ll_round(time * MINUTES_PER_HOUR); // fixes values like 4.99999
 
 	updateText();
 }
-- 
cgit v1.2.3