From f428c723fab91adb431a12e8ad70263b6feafc07 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 23 Sep 2010 19:35:15 -0500
Subject: Use integer font sizes to avoid blurriness on some systems.

---
 linden/indra/llrender/llfontregistry.cpp               |  5 +++--
 linden/indra/newview/skins/default/xui/en-us/fonts.xml | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index b1d8c5c..2140dbd 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -442,12 +442,13 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 		std::string font_path = local_path + *file_name_it;
 		BOOL is_fallback = !is_first_found;
 		F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult());
-		if (!fontp->loadFace(font_path, point_size * size_mult,
+		F32 size = (F32)llround(point_size * size_mult);
+		if (!fontp->loadFace(font_path, size,
 							 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
 		{
 			font_path = sys_path + *file_name_it;
 
-			if (!fontp->loadFace(font_path, point_size * size_mult,
+			if (!fontp->loadFace(font_path, size,
 								 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
 			{
 				LL_INFOS_ONCE("LLFontRegistry") << "Couldn't load font " << *file_name_it << LL_ENDL;
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 15a8254..5564079 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -137,23 +137,23 @@
 
   <font_size name="Monospace"
 	     comment="Size for monospaced font (points, or 1/72 of an inch)"
-	     size="9.0"
+	     size="9"
 	     />
   <font_size name="Huge"
 	     comment="Size of huge font (points, or 1/72 of an inch)"
-	     size="15.2"
+	     size="15"
 	     />
   <font_size name="Large"
 	     comment="Size of large font (points, or 1/72 of an inch)"
-	     size="11.5"
+	     size="12"
 	     />
   <font_size name="Medium"
 	     comment="Size of medium font (points, or 1/72 of an inch)"
-	     size="9.5"
+	     size="10"
 	     />
   <font_size name="Small"
 	     comment="Size of small font (points, or 1/72 of an inch)"
-	     size="8.5"
+	     size="8"
 	     />
 </fonts>
 
-- 
cgit v1.1