diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-29 07:46:08 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-29 07:46:08 -0700 |
| commit | 71ee3b924b1a8f87ffd44a0c7a3bd41511276251 (patch) | |
| tree | 5322f8f1975096a79b81ebe3f747f90b48ed28b4 /indra/newview/llappviewer.cpp | |
| parent | 36cfb37ebeaa6fa6ac6ff8b706ffdabd933d56bd (diff) | |
| parent | 2672194b1d3eb03648861a29e57d81a38f527746 (diff) | |
Merge release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 2 insertions, 8 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; |