diff --git a/.hgtags b/.hgtags index d32bea3d9f..43c50d422d 100755 --- a/.hgtags +++ b/.hgtags @@ -589,3 +589,4 @@ a3143db58a0f6b005232bf9018e7fef17ff9ec90 6.1.0-release 50f0ece62ddb5a244ecb6d00ef5a89d80ad50efa 6.1.1-release 82a89165e5929a6c3073d6cd60a543cb395f147b 6.2.0-release 706bdc7e25c6e6b8fb56f4a13fcce2936e70a79c 6.2.1-release +ec09daf1899c1c01c4ba0ba950fae572f2a612a8 6.2.2-release diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index ca06394388..bee9433817 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.2.2 +6.2.3 diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 01551e55c3..fc45aa0fe0 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3740,20 +3740,15 @@ 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"); // FIRE-13993: Leave out channel so we can use a URL like // http://wiki.phoenixviewer.com/firestorm_change_log_x.y.z.rev //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()) + ".html"; url += LLURI::escape(LLVersionInfo::getVersion()); + // 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 03fb4aa472..ceeaf8e94f 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -430,7 +430,7 @@ Prøv venligst om lidt igen. diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 9a6f790247..4d143b2e2a 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -780,7 +780,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 0b9f8eb34a..d439c0d416 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -656,7 +656,7 @@ Intenta iniciar sesión de nuevo en unos instantes. diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 598c0d4b8f..76008fdfba 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -627,7 +627,7 @@ Veuillez réessayer de vous connecter dans une minute. diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index bc3dce1d0a..d1bdc7cf36 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -582,7 +582,7 @@ support@secondlife.com にお問い合わせください。 diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 76455063ba..aee7409054 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -583,7 +583,7 @@ Aguarde um minuto antes que tentar logar-se novamente.