livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge LL viewer-release 6.2.2

meow-7.2.2
Ansariel 2019-05-21 18:04:57 +02:00
parent 4231762060 2672194b1d
commit 601a763cb3
9 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -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

2
indra/newview/VIEWER_VERSION.txt
View File

@ -1 +1 @@
6.2.2
6.2.3

11
indra/newview/llappviewer.cpp
View File

@ -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");
// <FS:Ansariel> 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) + "/";
// </FS:Ansariel>
//url += LLURI::escape(LLVersionInfo::getVersion()) + ".html";
url += LLURI::escape(LLVersionInfo::getVersion());
// </FS:Ansariel>
info["VIEWER_RELEASE_NOTES_URL"] = url;

2
indra/newview/skins/default/xui/da/strings.xml
View File

@ -430,7 +430,7 @@ Prøv venligst om lidt igen.
</string>
<!--
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
-->
<string name="LoadingData">

2
indra/newview/skins/default/xui/de/strings.xml
View File

@ -780,7 +780,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
</string>
<!--
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
-->
<string name="LoadingData">

2
indra/newview/skins/default/xui/es/strings.xml
View File

@ -656,7 +656,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
</string>
<!--
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
-->
<string name="LoadingData">

2
indra/newview/skins/default/xui/fr/strings.xml
View File

@ -627,7 +627,7 @@ Veuillez réessayer de vous connecter dans une minute.
</string>
<!--
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
-->
<string name="LoadingData">

2
indra/newview/skins/default/xui/ja/strings.xml
View File

@ -582,7 +582,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">

2
indra/newview/skins/default/xui/pt/strings.xml
View File

@ -583,7 +583,7 @@ Aguarde um minuto antes que tentar logar-se novamente.
</string>
<!--
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
-->
<string name="LoadingData">