diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-08-13 21:59:37 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-08-13 21:59:37 +0300 |
| commit | cdcdc4b3e377061930866d8ad439871615ca3390 (patch) | |
| tree | 0a472a95f684915e33fa84a533869bb10ea54e16 /indra/newview/skins/default | |
| parent | b045831843ba81b54c46cc0b944c4481fec9f222 (diff) | |
| parent | 823cef92ed9f22943888172f35b88f1a8efa0d8b (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/fonts.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 1545867d0d..2d5263b78f 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -4,7 +4,6 @@ <font name="default" comment="default font files (global fallbacks)"> <file>DejaVuSans.ttf</file> <os name="Windows"> - <file>MSNeoGothic.ttf</file> <file>meiryo.TTC</file> <file>MSGOTHIC.TTC</file> <file>gulim.ttc</file> @@ -12,6 +11,7 @@ <file>ArialUni.ttf</file> <file>msyh.ttc</file> <file load_collection="true">Cambria.ttc</file> + <file>malgun.ttf</file> </os> <os name="Mac"> <file>ヒラギノ角ゴシック W3.ttc</file> diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 67b99ca588..90f32ae452 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -770,6 +770,17 @@ tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." top_delta="16" width="260" /> + <button + left="10" + top="222" + height="20" + label="Align" + label_selected="Align current texture layers" + layout="topleft" + name="button align textures" + top_delta="0" + tool_tip="Align current texture layers" + width="66" /> <web_browser visible="false" enabled="false" |