diff options
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/da/strings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/de/strings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/es/strings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/fr/strings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/it/strings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/ja/strings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/pt/strings.xml | 2 | 
9 files changed, 10 insertions, 16 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d6695e7f3e..56e8cc8ff4 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 74d160dfae..eee3dc2c77 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 6e980d1609..95eb88614b 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 4dbafd27e0..1c5e51d2c8 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 68cd72802d..1b06675670 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 9cd5770108..dbd5cc3bf4 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 0ea6bd5d22..9492d062c3 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 497ea649d1..91d31faa76 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 3075113480..c4fbf1f4c9 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...  | 
