diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-11 21:10:38 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-11 21:10:38 +0000 |
| commit | 456968de657f17de4757e95b87350b2564e54f71 (patch) | |
| tree | de5f8398707a8556c5f7a74a9018bc3747e64330 /indra/newview/llappviewer.cpp | |
| parent | 38e585f5be6a1604aefd183d498070eae73dac0b (diff) | |
| parent | 2fb998bc02f3d8a7e0753b5d34db2c13dc70e212 (diff) | |
Merged in DV510-merge-6.4.7 (pull request #235)
Merge master 6.4.7 into DRTVWR-510
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(); |