From 71242b2cc63d8f3289c70f0770c665b8ba5d6f84 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 24 Feb 2022 21:00:54 +0200
Subject: SL-16924 Fix viewer not opening events from staging grid

---
 indra/newview/app_settings/settings.xml | 2 +-
 indra/newview/llfloaterevent.cpp        | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 12f435f931..70fa47f7a1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3858,7 +3858,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://events.secondlife.com/viewer/embed/event/</string>
+      <string>http://events.[GRID]/viewer/embed/event/[EVENT_ID]</string>
     </map>
     <key>FastCacheFetchEnabled</key>
     <map>
diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp
index a6640cc073..a3504ac6ee 100644
--- a/indra/newview/llfloaterevent.cpp
+++ b/indra/newview/llfloaterevent.cpp
@@ -108,11 +108,12 @@ void LLFloaterEvent::setEventID(const U32 event_id)
 		LLSD subs;
 		subs["EVENT_ID"] = (S32)event_id;
         // get the search URL and expand all of the substitutions                                                       
-        // (also adds things like [LANGUAGE], [VERSION], [OS], etc.)                                                    
-		std::ostringstream url;
-		url <<  gSavedSettings.getString("EventURL") << event_id << std::endl;
+        // (also adds things like [LANGUAGE], [VERSION], [OS], etc.)              
+
+        std::string expanded_url = LLWeb::expandURLSubstitutions(gSavedSettings.getString("EventURL"), subs);
+
 		// and load the URL in the web view                                                                             
-        mBrowser->navigateTo(url.str());
+        mBrowser->navigateTo(expanded_url);
 		
 	}
 }
-- 
cgit v1.2.3