From 0041285d3a57bf0eb78ce14bb9b3535e6868dc3e Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 3 Feb 2024 15:00:34 -0500
Subject: [PATCH] Make Report Second Life Bug go to new feedback portal

---
 indra/newview/app_settings/settings.xml |  2 +-
 indra/newview/llviewermenu.cpp          | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d1b5e30b691..bdfb0128235 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11821,7 +11821,7 @@
 			<key>Type</key>
 			<string>String</string>
 			<key>Value</key>
-			<string>https://jira.secondlife.com/secure/CreateIssueDetails!init.jspa?pid=10610&amp;issuetype=1&amp;environment=[ENVIRONMENT]&amp;customfield_10253=[LOCATION]</string>
+			<string>https://feedback.secondlife.com/</string>
 		</map>
 	<key>RevokePermsOnStopAnimation</key>
     <map>
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a600d403514..e269555832c 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8892,20 +8892,18 @@ void handle_show_url(const LLSD& param)
 
 void handle_report_bug(const LLSD& param)
 {
-	LLUIString url(param.asString());
-	
-	LLStringUtil::format_map_t replace;
-	std::string environment = LLAppViewer::instance()->getViewerInfoString(true);
-	const boost::regex regex("</?nolink>");
-	std::string stripped_env = ll_regex_replace(environment, regex, "");
+	//LLStringUtil::format_map_t replace;
+	//std::string environment = LLAppViewer::instance()->getViewerInfoString(true);
+	//const boost::regex regex("</?nolink>");
+	//std::string stripped_env = ll_regex_replace(environment, regex, "");
 
-	replace["[ENVIRONMENT]"] = LLURI::escape(stripped_env);
-	LLSLURL location_url;
-	LLAgentUI::buildSLURL(location_url);
-	replace["[LOCATION]"] = LLURI::escape(location_url.getSLURLString());
+	//replace["[ENVIRONMENT]"] = LLURI::escape(stripped_env);
+	//LLSLURL location_url;
+	//LLAgentUI::buildSLURL(location_url);
+	//replace["[LOCATION]"] = LLURI::escape(location_url.getSLURLString());
 
 	LLUIString file_bug_url = gSavedSettings.getString("ReportBugURL");
-	file_bug_url.setArgs(replace);
+	//file_bug_url.setArgs(replace);
 
 	LLWeb::loadURLExternal(file_bug_url.getString());
 }
-- 
GitLab