Revert commit bbb16ff97c1dbafa21358dbee8ca686d3c30478e.

This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501

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;
 }