diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-05 09:59:41 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-05 09:59:41 +0300 |
| commit | 07c7506b1b503e734ce16c8a7dca0408b018ebd6 (patch) | |
| tree | 998270242e6e40bf6b5dfd364eadd8f86a352282 /indra/newview/llappviewer.cpp | |
| parent | af7ff3d99f71dfc52fabebf77c985c73f4eb172d (diff) | |
| parent | e8422ec9d74e06ca7d2405a89d0e50adab1a36b0 (diff) | |
Merge branch 'DRTVWR-476' into DRTVWR-501-maint
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 d9cc026c52..cf9ad7ccbf 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3101,8 +3101,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(); |