SL-13704 Move link generation into getReleaseNotes()

2 files changed, 12 insertions, 10 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index cf9ad7ccbf..379e29a06b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3101,15 +3101,7 @@ 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(); // 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;
+	info["VIEWER_RELEASE_NOTES_URL"] = versionInfo.getReleaseNotes();;
 
 	// Position
 	LLViewerRegion* region = gAgent.getRegion();
diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp
index 4720a989b0..ccfb9f3e41 100644
--- a/indra/newview/llversioninfo.cpp
+++ b/indra/newview/llversioninfo.cpp
@@ -28,6 +28,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llevents.h"
 #include "lleventfilter.h"
+#include "lltrans.h"
 #include "llversioninfo.h"
 #include "stringize.h"
 #include <boost/regex.hpp>
@@ -173,5 +174,14 @@ std::string LLVersionInfo::getBuildConfig()
 
 std::string LLVersionInfo::getReleaseNotes()
 {
-    return mReleaseNotes;
+    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
 }