Expanded chat font size options including Monospace and Huge

indra/llrender/llfontgl.cpp

@@ -1019,7 +1019,7 @@ LLFontGL* LLFontGL::getFontSansSerifBig()
 //static 
 LLFontGL* LLFontGL::getFontSansSerifHuge()
 {
-	static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Large",0));
+	static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Huge",0));
 	return fontp;
 }
 

indra/llui/llconsole.cpp

@@ -103,22 +103,26 @@ void LLConsole::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 void LLConsole::setFontSize(S32 size_index)
 {
-	if (-1 == size_index)
+	switch (size_index)
 	{
+	case -1:
 		mFont = LLFontGL::getFontMonospace();
-	}
-	else if (0 == size_index)
-	{
+		break;
+	case 0:
+		mFont = LLFontGL::getFontSansSerifSmall();
+		break;
+	default:
+	case 1:
 		mFont = LLFontGL::getFontSansSerif();
-	}
-	else if (1 == size_index)
-	{
+		break;
+	case 2:
 		mFont = LLFontGL::getFontSansSerifBig();
-	}
-	else
-	{
+		break;
+	case 3:
 		mFont = LLFontGL::getFontSansSerifHuge();
+		break;
 	}
+
 	// Make sure the font exists
 	if (mFont == NULL)
 	{

indra/newview/llchatbar.cpp

@@ -59,6 +59,7 @@
 #include "llmultigesture.h"
 #include "llui.h"
 #include "lluictrlfactory.h"
+#include "llviewerchat.h"
 // [RLVa:KB] - Checked: 2010-02-27 (RLVa-1.2.0b)
 #include "rlvactions.h"
 #include "rlvcommon.h"
@@ -133,6 +134,8 @@ BOOL LLChatBar::postBuild()
 
 	mInputEditor->setMaxTextLength(DB_CHAT_MSG_STR_LEN);
 	mInputEditor->setEnableLineHistory(TRUE);
+	
+	mInputEditor->setFont(LLViewerChat::getChatFont());
 
 	mIsBuilt = TRUE;
 

indra/newview/llfloaterimnearbychat.cpp

@@ -224,6 +224,7 @@ void LLFloaterIMNearbyChat::reloadMessages(bool clean_messages/* = false*/)
 		// Update the messages without re-writing them to a log file.
 		addMessage(*it,false, do_not_log);
 	}
+	mInputEditor->setFont(LLViewerChat::getChatFont());
 }
 
 void LLFloaterIMNearbyChat::loadHistory()

indra/newview/llfloaterpreference.cpp

@@ -538,10 +538,6 @@ void LLFloaterPreference::saveAvatarProperties( void )
 
 BOOL LLFloaterPreference::postBuild()
 {
-	gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLFloaterIMSessionTab::processChatHistoryStyleUpdate, false));
-
-	gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLViewerChat::signalChatFontChanged));
-
 	gSavedSettings.getControl("ChatBubbleOpacity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onNameTagOpacityChange, this, _2));
 
 	gSavedSettings.getControl("PreferredMaturity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeMaturity, this));

indra/newview/llviewerchat.cpp

@@ -190,6 +190,9 @@ LLFontGL* LLViewerChat::getChatFont()
 	LLFontGL* fontp = NULL;
 	switch(font_size)
 	{
+		case -1:
+			fontp = LLFontGL::getFontMonospace();
+			break;
 		case 0:
 			fontp = LLFontGL::getFontSansSerifSmall();
 			break;
@@ -200,6 +203,9 @@ LLFontGL* LLViewerChat::getChatFont()
 		case 2:
 			fontp = LLFontGL::getFontSansSerifBig();
 			break;
+		case 3:
+			fontp = LLFontGL::getFontSansSerifHuge();
+			break;
 	}
 	
 	return fontp;

indra/newview/llviewercontrol.cpp

@@ -79,6 +79,8 @@
 #include "rlvactions.h"
 #include "rlvcommon.h"
 // [/RLVa:KB]
+#include "llfloaterimsessiontab.h"
+#include "llviewerchat.h"
 
 // Third party library includes
 #include <boost/algorithm/string.hpp>
@@ -342,6 +344,10 @@ static bool handleChatFontSizeChanged(const LLSD& newvalue)
 	{
 		gConsole->setFontSize(newvalue.asInteger());
 	}
+
+	LLViewerChat::signalChatFontChanged();
+	LLFloaterIMSessionTab::processChatHistoryStyleUpdate(false);
+
 	return true;
 }
 

indra/newview/skins/default/xui/en/panel_preferences_chat.xml

@@ -68,6 +68,10 @@
         name="chat_font_size"
         top_pad="5"
         width="100">
+      <item
+          label="Monospace"
+          name="Monospace"
+          value="-1"/>
       <item
           label="Small"
           name="Small"
@@ -79,7 +83,11 @@
       <item
           label="Large"
           name="Large"
-          value="2"/>  
+          value="2"/>
+      <item
+          label="Huge"
+          name="Huge"
+          value="3"/>
     </combo_box>
 
     <check_box