diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:10 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:10 +0300 |
commit | 89e17d1780f498601c51e8c01ca963fb0c1b4d0b (patch) | |
tree | 8f9a4281a013ac04d3c15affc5ab72ead1df3a50 /indra/newview/skins/default/xui/en | |
parent | 4ac08f1ac5b003b95fc9087183d03c0291f6554b (diff) | |
parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) |
Merge branch 'master' into DRTVWR-482
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/fonts.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 2d5263b78f..76df0abdfd 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -21,6 +21,7 @@ <file>AppleGothic.dfont</file> <file>AppleGothic.ttf</file> <file>AppleSDGothicNeo-Regular.otf</file> + <file>AppleSDGothicNeo.ttc</file> <file>华文细黑.ttf</file> <file>PingFang.ttc</file> <file>STIXGeneral.otf</file> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index e228c5bdba..873b95926b 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -461,7 +461,7 @@ name="Events"> <menu_item_call.on_click function="Advanced.ShowURL" - parameter="http://events.secondlife.com"/> + parameter="https://secondlife.com/my/community/events"/> </menu_item_call> <menu_item_check label="Search..." diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 61a23851ed..089498dfb9 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1513,7 +1513,7 @@ Go to the [SECOND_LIFE] events web page? <tag>confirm</tag> <url option="0" name="url"> - http://secondlife.com/events/ + https://secondlife.com/my/community/events </url> <usetemplate name="okcancelbuttons" |