diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3d30caa7f1de56d6ec970d012759abbb8f25ea5b..69b056b1dd2e6b45c9d0bd9ce3e698578c21f46d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3317,6 +3317,12 @@ LLSD LLAppViewer::getViewerInfo() const
     info["WINDOW_WIDTH"] = window_rect.getWidth();
     info["WINDOW_HEIGHT"] = window_rect.getHeight();
     info["FONT_SIZE_ADJUSTMENT"] = gSavedSettings.getF32("FontScreenDPI");
+	std::string mainfont = gSavedSettings.getString("FontOverrideMain");
+	info["FONT_MAIN_OVERRIDE"] = !mainfont.empty() ? mainfont : LLTrans::getString("Default");
+	std::string monofont = gSavedSettings.getString("FontOverrideMonospace");
+	info["FONT_MONO_OVERRIDE"] = !monofont.empty() ? monofont : LLTrans::getString("Default");
+	info["FONT_CHAT_OVERRIDE"] = gSavedSettings.getString("ChatFontName");
+	info["FONT_SCRIPT_OVERRIDE"] = gSavedSettings.getString("ScriptFontName");
     info["UI_SCALE"] = gSavedSettings.getF32("UIScaleFactor");
     info["DRAW_DISTANCE"] = gSavedSettings.getF32("RenderFarClip");
     info["NET_BANDWITH"] = gSavedSettings.getF32("ThrottleBandwidthKBPS");
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e4ff0fb5fa3e78f4e512de38fbb407f69ebf2f12..ac11833e1e8c5ebfc24cc76b696eeb47c8fb3380 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -78,6 +78,10 @@ Graphics Card: [GRAPHICS_CARD]
 	<string name="AboutSettings">
 Window size: [WINDOW_WIDTH]x[WINDOW_HEIGHT]
 Font Size Adjustment: [FONT_SIZE_ADJUSTMENT]pt
+UI Font: [FONT_MAIN_OVERRIDE]
+Monospace Font: [FONT_MONO_OVERRIDE]
+Chat Font: [FONT_CHAT_OVERRIDE]
+Script Font: [FONT_SCRIPT_OVERRIDE]
 UI Scaling: [UI_SCALE]
 Draw distance: [DRAW_DISTANCE]m
 Bandwidth: [NET_BANDWITH]kbit/s