From 9dcb80e6373aabe993eea8609fd7d26938192c5f Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 26 Apr 2017 17:17:39 +0300
Subject: [PATCH] MAINT-1239 Fixed font
---
indra/newview/llpanelpermissions.cpp | 3 +++
indra/newview/skins/default/xui/en/floater_tools.xml | 2 ++
2 files changed, 5 insertions(+)
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index cf38090798e..29ca172f609 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -383,6 +383,9 @@ void LLPanelPermissions::refresh()
style_params.color = link_color;
style_params.readonly_color = link_color;
style_params.is_link = true; // link will be added later
+ const LLFontGL* fontp = getChild<LLTextBox>("Creator Name")->getFont();
+ style_params.font.name = LLFontGL::nameFromFont(fontp);
+ style_params.font.size = LLFontGL::sizeFromFont(fontp);
style_params.font.style = "UNDERLINE";
LLAvatarName av_name;
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c3a5a0dce8c..ed3cc268516 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -965,6 +965,7 @@
height="29"
layout="topleft"
name="Creator Name"
+ font="SansSerifSmall"
top_delta="-1"
translate="false"
width="170"
@@ -1012,6 +1013,7 @@
height="29"
layout="topleft"
name="Owner Name"
+ font="SansSerifSmall"
left_pad="1"
top_delta="-1"
translate="false"
--
GitLab