diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d1b5e30b6912c83437e3e729c2e49eee30c4cd18..bdfb01282353dd0d4387b083975065957be45edc 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&issuetype=1&environment=[ENVIRONMENT]&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 a600d4035142b700025b20c6d473cc1d369e5b73..e269555832c536afab30059efba0e58c9562bf57 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()); }