diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d6695e7f3e5d62e9ec0560f42ed67b32f4a6f767..56e8cc8ff42b3138902056ff2489b8142b4f76c4 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3105,17 +3105,11 @@ LLSD LLAppViewer::getViewerInfo() const } // return a URL to the release notes for this viewer, such as: - // http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0.123456 + // https://releasenotes.secondlife.com/viewer/2.1.0.123456.html std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL"); if (! LLStringUtil::endsWith(url, "/")) url += "/"; - std::string channel = LLVersionInfo::getChannel(); - if (LLStringUtil::endsWith(boost::to_lower_copy(channel), " edu")) // Release Notes url shouldn't include the EDU parameter - { - boost::erase_tail(channel, 4); - } - url += LLURI::escape(channel) + "/"; - url += LLURI::escape(LLVersionInfo::getVersion()); + url += LLURI::escape(LLVersionInfo::getVersion()) + ".html"; info["VIEWER_RELEASE_NOTES_URL"] = url; diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 74d160dfaec1ccb5cb20e1bac7f5a6edc0da5f63..eee3dc2c77792f04b43cf10feb96fbcc3373f503 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -432,7 +432,7 @@ Prøv venligst om lidt igen. Noter om version </string> <string name="RELEASE_NOTES_BASE_URL"> - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ </string> <string name="LoadingData"> Henter... diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 6e980d1609c4f290bf828d3d6bf15c98339eaf20..95eb88614b123387d43221397e06b0a6a661a7e9 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -648,7 +648,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. Versionshinweise </string> <string name="RELEASE_NOTES_BASE_URL"> - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ </string> <string name="LoadingData"> Wird geladen... diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4dbafd27e0ab9f99dab18e5bdf167af2359af151..1c5e51d2c8eba01afce98f8d707c11bc5d0455a0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -324,7 +324,7 @@ Please try logging in again in a minute.</string> <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">http://wiki.secondlife.com/wiki/Release_Notes/</string> + <string name="RELEASE_NOTES_BASE_URL" translate="false">https://releasenotes.secondlife.com/viewer/</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/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 68cd72802d37c9b25070e58feb1159970974d988..1b066756708ce930379adef2c08a621429431ae1 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -640,7 +640,7 @@ Intenta iniciar sesión de nuevo en unos instantes. Notas de la versión </string> <string name="RELEASE_NOTES_BASE_URL"> - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ </string> <string name="LoadingData"> Cargando... diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 9cd577010863c20ca4f0e5ced2974553fb0d63a4..dbd5cc3bf46df07698706f920add5967aad85df5 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -649,7 +649,7 @@ Veuillez réessayer de vous connecter dans une minute. Notes de version </string> <string name="RELEASE_NOTES_BASE_URL"> - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ </string> <string name="LoadingData"> Chargement... diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 0ea6bd5d22d183132fa37170c651473a9298ee57..9492d062c3a162a5e8b704880d56c1500224f255 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -645,7 +645,7 @@ Prova ad accedere nuovamente tra un minuto. Note sulla versione </string> <string name="RELEASE_NOTES_BASE_URL"> - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ </string> <string name="LoadingData"> In caricamento... diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 497ea649d1ff87fd087d8fe3e84059e332b55d9b..91d31faa766061914755ee71a47c3183cde1dc5e 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -648,7 +648,7 @@ support@secondlife.com ã«ãŠå•ã„åˆã‚ã›ãã ã•ã„。 リリースノート </string> <string name="RELEASE_NOTES_BASE_URL"> - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ </string> <string name="LoadingData"> ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°... diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 30751134800e074f0d380372616abb0f324586fe..c4fbf1f4c99b92c4e09de96ec7f813802805edcd 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -605,7 +605,7 @@ Aguarde um minuto antes que tentar logar-se novamente. Notas de versão </string> <string name="RELEASE_NOTES_BASE_URL"> - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ </string> <string name="LoadingData"> Carregando...