livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-8855 FIXED Location SLURL gets truncated when using Help -> Report Bug to file JIRA

maxim_productengine 2018-07-10 18:06:52 +03:00
parent eaf6d49aec
commit 4e84a7f951
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewermenu.cpp
View File

@ -134,6 +134,7 @@
#include "llpathfindingmanager.h"
#include "llstartup.h"
#include "boost/unordered_map.hpp"
#include <boost/regex.hpp>
#include "llcleanup.h"
using namespace LLAvatarAppearanceDefines;
@ -8025,7 +8026,12 @@ void handle_report_bug(const LLSD& param)
LLUIString url(param.asString());
LLStringUtil::format_map_t replace;
replace["[ENVIRONMENT]"] = LLURI::escape(LLAppViewer::instance()->getViewerInfoString(true));
std::string environment = LLAppViewer::instance()->getViewerInfoString(true);
boost::regex regex;
regex.assign("</?nolink>");
std::string stripped_env = boost::regex_replace(environment, regex, "");
replace["[ENVIRONMENT]"] = LLURI::escape(stripped_env);
LLSLURL location_url;
LLAgentUI::buildSLURL(location_url);
replace["[LOCATION]"] = LLURI::escape(location_url.getSLURLString());