diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-05 22:33:57 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-05 22:36:00 +0300 |
commit | 00acc562f929eaa0f89386d97786815e56742d26 (patch) | |
tree | 7916492eaea4694af8c2a35196c14a96a4fa54e9 /indra/newview | |
parent | 59b9894d4c88c30432cfb45c1d295d54ba25d42b (diff) |
Revert commit bbb16ff97c1dbafa21358dbee8ca686d3c30478e.
This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llappviewer.cpp | 10 | ||||
-rw-r--r-- | indra/newview/llversioninfo.cpp | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 379e29a06b..cf9ad7ccbf 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3101,7 +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 - info["VIEWER_RELEASE_NOTES_URL"] = versionInfo.getReleaseNotes();; + 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(); diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp index ccfb9f3e41..4720a989b0 100644 --- a/indra/newview/llversioninfo.cpp +++ b/indra/newview/llversioninfo.cpp @@ -28,7 +28,6 @@ #include "llviewerprecompiledheaders.h" #include "llevents.h" #include "lleventfilter.h" -#include "lltrans.h" #include "llversioninfo.h" #include "stringize.h" #include <boost/regex.hpp> @@ -174,14 +173,5 @@ std::string LLVersionInfo::getBuildConfig() std::string LLVersionInfo::getReleaseNotes() { - 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 + return mReleaseNotes; } |