diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2017-04-26 17:17:39 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2017-04-26 17:17:39 +0300 |
| commit | 9dcb80e6373aabe993eea8609fd7d26938192c5f (patch) | |
| tree | ff62143b68372d3898757ffec26a845fa4a8120c | |
| parent | 5dd4a2847289d94ff65aa27f0f24e963cede636b (diff) | |
MAINT-1239 Fixed font
| -rw-r--r-- | indra/newview/llpanelpermissions.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index cf38090798..29ca172f60 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 c3a5a0dce8..ed3cc26851 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" |