Merge with q/viewer-release

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 4fdb010162..f32fcd6b7f 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -496,11 +496,11 @@ private:
 
 void fetch_table(std::string table)
 {
-	const std::string base       = "http://viewer-settings.s3.amazonaws.com/";
+	const std::string base       = gSavedSettings.getString("FeatureManagerHTTPTable");
 
 	const std::string filename   = llformat(table.c_str(), LLVersionInfo::getVersion().c_str());
 
-	const std::string url        = base + filename;
+	const std::string url        = base + "/" + filename;
 
 	const std::string path       = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename);