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

SL-13704 Move link generation into getReleaseNotes()

master
Andrey Kleshchev 2020-08-04 20:36:56 +03:00
parent 07c7506b1b
commit bbb16ff97c
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llappviewer.cpp
View File

@ -3101,15 +3101,7 @@ LLSD LLAppViewer::getViewerInfo() const
// return a URL to the release notes for this viewer, such as:
// https://releasenotes.secondlife.com/viewer/2.1.0.123456.html
std::string url = versionInfo.getReleaseNotes(); // VVM supplied
if (url.empty())
{
url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
if (!LLStringUtil::endsWith(url, "/"))
url += "/";
url += LLURI::escape(versionInfo.getVersion()) + ".html";
}
info["VIEWER_RELEASE_NOTES_URL"] = url;
info["VIEWER_RELEASE_NOTES_URL"] = versionInfo.getReleaseNotes();;
// Position
LLViewerRegion* region = gAgent.getRegion();

12
indra/newview/llversioninfo.cpp
View File

@ -28,6 +28,7 @@
#include "llviewerprecompiledheaders.h"
#include "llevents.h"
#include "lleventfilter.h"
#include "lltrans.h"
#include "llversioninfo.h"
#include "stringize.h"
#include <boost/regex.hpp>
@ -173,5 +174,14 @@ std::string LLVersionInfo::getBuildConfig()
std::string LLVersionInfo::getReleaseNotes()
{
return mReleaseNotes;
if (mReleaseNotes.empty())
{
std::string url = mReleaseNotes;
url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
if (!LLStringUtil::endsWith(url, "/"))
url += "/";
url += LLURI::escape(getVersion()) + ".html";
return url;
}
return mReleaseNotes; // VVM supplied
}