FIRE-22483: Parse HTTPS map SLURL properly

Mon, 09 Apr 2018 23:59:51 +0200

author
Ansariel
date
Mon, 09 Apr 2018 23:59:51 +0200
changeset 55037
36ebdfde1b2f
parent 55036
b83d5820620a
child 55038
fd5bea6797a2

FIRE-22483: Parse HTTPS map SLURL properly

indra/llui/llurlentry.cpp file | annotate | diff | revisions
     1.1 --- a/indra/llui/llurlentry.cpp	Mon Apr 09 18:42:33 2018 +0200
     1.2 +++ b/indra/llui/llurlentry.cpp	Mon Apr 09 23:59:51 2018 +0200
     1.3 @@ -437,7 +437,7 @@
     1.4  LLUrlEntrySLURL::LLUrlEntrySLURL()
     1.5  {
     1.6  	// see http://slurl.com/about.php for details on the SLURL format
     1.7 -	mPattern = boost::regex("http://(maps.secondlife.com|slurl.com)/secondlife/[^ /]+(/\\d+){0,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
     1.8 +	mPattern = boost::regex("https?://(maps.secondlife.com|slurl.com)/secondlife/[^ /]+(/\\d+){0,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
     1.9  							boost::regex::perl|boost::regex::icase);
    1.10  	mMenuName = "menu_url_slurl.xml";
    1.11  	mTooltip = LLTrans::getString("TooltipSLURL");

mercurial