summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-05-04 23:35:54 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-05-04 23:35:54 +0300
commit6364e2fff696090253c902bec02d68f036ad509c (patch)
tree8f9f6a8834cf392552c7be07086d9cb0cff61631 /indra/newview/skins/default
parentd3b10072f4c52b01c8d77ad1990d69dd89fc1310 (diff)
parent4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff)
Merge branch 'master' into DRTVWR-460
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/fonts.xml1
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml2
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
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 98bb77d9e0..8a91a1f721 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"