From 72e8f07b0434666f1b91fca390b70df7578e5fb0 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 7 Jun 2024 18:22:04 -0400
Subject: [PATCH] Swap gitlab to github
---
indra/deps/CMakeLists.txt | 2 +-
indra/newview/llappviewer.cpp | 8 +++++++-
.../newview/skins/default/xui/en/menu_login.xml | 16 ++++++++--------
.../newview/skins/default/xui/en/menu_viewer.xml | 4 ++--
.../skins/default/xui/en/notifications.xml | 4 ++--
indra/newview/skins/default/xui/en/strings.xml | 2 +-
.../skins/default/xui/ja/notifications.xml | 2 +-
indra/newview/skins/default/xui/ja/strings.xml | 2 +-
8 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/indra/deps/CMakeLists.txt b/indra/deps/CMakeLists.txt
index 024ccfdaa84..614c976ee1f 100644
--- a/indra/deps/CMakeLists.txt
+++ b/indra/deps/CMakeLists.txt
@@ -24,7 +24,7 @@ add_library(deps
FetchContent_Declare(
meshoptimizer
- GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/meshoptimizer.git
+ GIT_REPOSITORY https://github.com/zeux/meshoptimizer.git
GIT_TAG v0.20
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 33c2dd0e83c..e8138b6b44b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3216,7 +3216,13 @@ LLSD LLAppViewer::getViewerInfo() const
url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
if (!LLStringUtil::endsWith(url, "/"))
url += "/";
- url += LLURI::escape(versionInfo.getVersion()) + ".html";
+ url += LLURI::escape(versionInfo.getVersion());
+ if (versionInfo.getViewerMaturity() == LLVersionInfo::BETA_VIEWER)
+ url += LLURI::escape("-beta");
+ else if (versionInfo.getViewerMaturity() == LLVersionInfo::PROJECT_VIEWER)
+ url += LLURI::escape("-project");
+ else if (versionInfo.getViewerMaturity() == LLVersionInfo::TEST_VIEWER)
+ url += LLURI::escape("-test");
}
info["VIEWER_RELEASE_NOTES_URL"] = url;
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index f95db4ce975..5b44c252f7b 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -79,20 +79,20 @@
function="Advanced.ShowURL"
parameter="https://www.alchemyviewer.org/downloads"/>
</menu_item_call>
- <menu_item_call
+ <menu_item_call
label="Report Alchemy Bug"
name="Report Alchemy Bug">
- <menu_item_call.on_click
+ <menu_item_call.on_click
function="Advanced.ShowURL"
- parameter="https://git.alchemyviewer.org/alchemy/viewer/issues/new?issuable_template=Bug"/>
- </menu_item_call>
- <menu_item_call
+ parameter="https://github.com/AlchemyViewer/Alchemy/issues/new?assignees=&labels=bug%2Ctriage&projects=&template=10-bug.yaml"/>
+ </menu_item_call>
+ <menu_item_call
label="Request Alchemy Improvement"
name="Request Alchemy Improvement">
- <menu_item_call.on_click
+ <menu_item_call.on_click
function="Advanced.ShowURL"
- parameter="https://git.alchemyviewer.org/alchemy/viewer/issues/new?issuable_template=Improvement"/>
- </menu_item_call>
+ parameter="https://github.com/AlchemyViewer/Alchemy/issues/new?assignees=&labels=enhancement%2C+triage&projects=&template=20-enhancement.md&title=New+Feature"/>
+ </menu_item_call>
<menu_item_separator/>
<menu_item_call
label="Second Life Knowledge Base"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7e4648eb48c..d7baaf62ee1 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2041,14 +2041,14 @@ function="World.EnvPreset"
name="Report Alchemy Bug">
<menu_item_call.on_click
function="Advanced.ShowURL"
- parameter="https://git.alchemyviewer.org/alchemy/viewer/issues/new?issuable_template=Bug"/>
+ parameter="https://github.com/AlchemyViewer/Alchemy/issues/new?assignees=&labels=bug%2Ctriage&projects=&template=10-bug.yaml"/>
</menu_item_call>
<menu_item_call
label="Request Alchemy Improvement"
name="Request Alchemy Improvement">
<menu_item_call.on_click
function="Advanced.ShowURL"
- parameter="https://git.alchemyviewer.org/alchemy/viewer/issues/new?issuable_template=Improvement"/>
+ parameter="https://github.com/AlchemyViewer/Alchemy/issues/new?assignees=&labels=enhancement%2C+triage&projects=&template=20-enhancement.md&title=New+Feature"/>
</menu_item_call>
<menu_item_separator/>
<menu_item_call
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 83f7fd4eb11..eb112756f5d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3922,7 +3922,7 @@ We're having trouble connecting. There may be a problem with your Internet
You can either check your Internet connection and try again in a few minutes, click Help to view the [SUPPORT_SITE], or click Teleport to attempt to teleport home.
<url option="1" name="url">
- https://git.alchemyviewer.org/alchemy/alchemy-next/issues
+ https://github.com/AlchemyViewer/Alchemy/issues
</url>
<form name="form">
<button
@@ -3950,7 +3950,7 @@ We're having trouble connecting. There may be a problem with your Internet
You can either check your Internet connection and try again in a few minutes or click Help to view the [SUPPORT_SITE].
<url option="1" name="url">
- https://git.alchemyviewer.org/alchemy/alchemy-next/issues
+ https://github.com/AlchemyViewer/Alchemy/issues
</url>
<form name="form">
<button
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 937c6af9aae..cef6aa18083 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -361,7 +361,7 @@ are allowed.
<string name="ReleaseNotes">Release Notes</string>
<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
- <string name="RELEASE_NOTES_BASE_URL" translate="false">https://git.alchemyviewer.org/alchemy/alchemy/releases/</string>
+ <string name="RELEASE_NOTES_BASE_URL" translate="false">https://github.com/AlchemyViewer/Alchemy/releases/tag/</string>
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string name="LoadingData">Loading...</string>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 7ec8658ec25..13324a03ac8 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1910,7 +1910,7 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
インターãƒãƒƒãƒˆæŽ¥ç¶šã‚’確èªã—ã¦ã‹ã‚‰æ•°åˆ†å¾Œã«å†æŽ¥ç¶šã™ã‚‹ã‹ã€ãƒ˜ãƒ«ãƒ—をクリックã—㦠[SUPPORT_SITE]ã‚’ã”覧ã«ãªã‚‹ã‹ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’クリックã—ã¦ãƒ›ãƒ¼ãƒ ã«ç§»å‹•ã—ã¦ã¿ã¦ãã ã•ã„。
<tag>fail</tag>
- <url name="url">https://git.alchemyviewer.org/alchemy/alchemy-next/issues</url>
+ <url name="url">https://github.com/AlchemyViewer/Alchemy/issues</url>
<form name="form">
<button name="OK" text="ＯＫ"/>
<button name="Help" text="ヘルプ"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 49bf456b633..65b1e52561c 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -743,7 +743,7 @@ https://secondlife.com/viewer-access-faq
</string>
<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
<string name="RELEASE_NOTES_BASE_URL" translate="false">
- https://git.alchemyviewer.org/alchemy/alchemy/releases/
+ https://github.com/AlchemyViewer/Alchemy/releases/tag/
</string>
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string name="LoadingData">
--
GitLab