diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-13 11:09:26 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-13 11:09:26 -0600 |
| commit | 0c0ed56167f76820f612d0069b1f2d6462cfcf98 (patch) | |
| tree | 0534a7f0cbe461b5dac33444f16a535dc9d13446 /indra/newview/llappviewer.cpp | |
| parent | b55be119002d547887e739d50be3136e5040fa25 (diff) | |
| parent | 89cde15fb8c52071805af78e61848e743f2ab2f1 (diff) | |
Merge branch 'master' 6.4.7 into DRTVWR-497
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 b933060155..32df6ea32a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3099,8 +3099,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(); |