Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 254008fbcf..de26d19efc 100755
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -183,8 +183,8 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
 	mDescender = -mFTFace->descender * pixels_per_unit;
 	mLineHeight = mFTFace->height * pixels_per_unit;
 
-	S32 max_char_width = llround(0.5f + (x_max - x_min));
-	S32 max_char_height = llround(0.5f + (y_max - y_min));
+	S32 max_char_width = ll_round(0.5f + (x_max - x_min));
+	S32 max_char_height = ll_round(0.5f + (y_max - y_min));
 
 	mFontBitmapCachep->init(components, max_char_width, max_char_height);
 	claimMem(mFontBitmapCachep);