diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-14 16:28:25 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-14 16:28:25 +0100 |
| commit | 7e37263fc5cb93e31727b2e3243f2221ed1f8cad (patch) | |
| tree | 6e4f0fe5eb054bda8041fa894063b7987cb8af7c /indra/newview/llappviewer.cpp | |
| parent | d760f693ca3a01946380e7d5d352c18eabf4c055 (diff) | |
| parent | 89cde15fb8c52071805af78e61848e743f2ab2f1 (diff) | |
Merge remote-tracking branch 'origin/master' into SL-12995
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c1fd09a17b..9401481e8c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3098,8 +3098,15 @@ 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(); - info["VIEWER_RELEASE_NOTES_URL"] = url.empty()? LLTrans::getString("RetrievingData") : url; + 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; // Position LLViewerRegion* region = gAgent.getRegion(); |