OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor: Update LLLoginService to handle explicitly set login locations that include decimal precision. Fractions might be introduced if setting the initial login location from a viewer splash screen with data from the DataSnapshot service. At present the fractions cause regex to fail when matching the login string causing an exception.

mb-throttle-test
AliciaRaven 2014-11-14 21:55:52 +00:00 committed by Justin Clark-Casey
parent d3b43a96fb
commit b9f870fa73
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -615,7 +615,7 @@ namespace OpenSim.Services.LLLoginService
// e.g. New Moon&135&46 New Moon@osgrid.org:8002&153&34 // e.g. New Moon&135&46 New Moon@osgrid.org:8002&153&34
where = "url"; where = "url";
GridRegion region = null; GridRegion region = null;
Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$"); Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+[.]?\d*)&(?<y>\d+[.]?\d*)&(?<z>\d+[.]?\d*)$");
Match uriMatch = reURI.Match(startLocation); Match uriMatch = reURI.Match(startLocation);
if (uriMatch == null) if (uriMatch == null)
{ {