Merge remote-tracking branch 'secondlife/main'

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 890580ddff..6cb3aee20c 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -575,6 +575,7 @@ std::string LLGridManager::getGridLoginID()
 
 std::string LLGridManager::getUpdateServiceURL()
 {
+    auto env_update_service = LLStringUtil::getoptenv("SL_UPDATE_SERVICE");
     std::string update_url_base = gSavedSettings.getString("CmdLineUpdateService");;
     if ( !update_url_base.empty() )
     {
@@ -582,6 +583,13 @@ std::string LLGridManager::getUpdateServiceURL()
             << "Update URL base overridden from command line: " << update_url_base
             << LL_ENDL;
     }
+    else if (env_update_service && env_update_service->find("http") != std::string::npos)
+    {
+        update_url_base = *env_update_service;
+        LL_INFOS("UpdaterService", "GridManager")
+            << "Update URL base overridden from SL_UPDATE_SERVICE environment variable: " << update_url_base
+            << LL_ENDL;
+    }
     else if ( mGridList[mGrid].has(GRID_UPDATE_SERVICE_URL) )
     {
         update_url_base = mGridList[mGrid][GRID_UPDATE_SERVICE_URL].asString();