Merge remote-tracking branch 'jacek/exp' into exp

Conflicts:
	.gitignore
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/install.xml

Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.

1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index 6cb1727..e3a953b 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -233,7 +233,8 @@ public:
         static LLFontGL* getFontMonospace();
         static LLFontGL* getFontSansSerifSmall();
         static LLFontGL* getFontSansSerif();
-        static LLFontGL* getFontSansSerifBig();
+        static LLFontGL* getFontSansSerifBigger();
+        static LLFontGL* getFontSansSerifLarge();
         static LLFontGL* getFontSansSerifHuge();
         static LLFontGL* getFontSansSerifBold();
         static LLFontGL* getFontExtChar();