FIRE-22483: Parse HTTPS map SLURL properly - another case

Tue, 10 Apr 2018 00:06:16 +0200

author
Ansariel
date
Tue, 10 Apr 2018 00:06:16 +0200
changeset 55038
fd5bea6797a2
parent 55037
36ebdfde1b2f
child 55092
99a950ce3bf6

FIRE-22483: Parse HTTPS map SLURL properly - another case

indra/llui/llurlentry.cpp file | annotate | diff | revisions
     1.1 --- a/indra/llui/llurlentry.cpp	Mon Apr 09 23:59:51 2018 +0200
     1.2 +++ b/indra/llui/llurlentry.cpp	Tue Apr 10 00:06:16 2018 +0200
     1.3 @@ -350,7 +350,7 @@
     1.4  {
     1.5  	// <FS:Ansariel> Inworldz special
     1.6  	//mPattern = boost::regex("(http://(maps.secondlife.com|slurl.com)/secondlife/|secondlife://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
     1.7 -	mPattern = boost::regex("(http://(maps.secondlife.com|slurl.com)/secondlife/|(secondlife|inworldz|iw)://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
     1.8 +	mPattern = boost::regex("(https?://(maps.secondlife.com|slurl.com)/secondlife/|(secondlife|inworldz|iw)://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
     1.9  									boost::regex::perl|boost::regex::icase);
    1.10  	mMenuName = "menu_url_http.xml";
    1.11  	mTooltip = LLTrans::getString("TooltipHttpUrl");

mercurial