aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorAliciaRaven2014-11-14 21:55:52 +0000
committerJustin Clark-Casey2014-11-19 18:44:45 +0000
commitb9f870fa73d18de15b8a2d067e65366ab624be2b (patch)
tree3e78f4ee5d5979e6dd171cfc3d9b01372fc666ca /OpenSim/Services/LLLoginService/LLLoginService.cs
parentAdd 'terrain feature' command (diff)
downloadopensim-SC_OLD-b9f870fa73d18de15b8a2d067e65366ab624be2b.zip
opensim-SC_OLD-b9f870fa73d18de15b8a2d067e65366ab624be2b.tar.gz
opensim-SC_OLD-b9f870fa73d18de15b8a2d067e65366ab624be2b.tar.bz2
opensim-SC_OLD-b9f870fa73d18de15b8a2d067e65366ab624be2b.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index b1aabe6..d2ff292 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -615,7 +615,7 @@ namespace OpenSim.Services.LLLoginService
615 // e.g. New Moon&135&46 New Moon@osgrid.org:8002&153&34 615 // e.g. New Moon&135&46 New Moon@osgrid.org:8002&153&34
616 where = "url"; 616 where = "url";
617 GridRegion region = null; 617 GridRegion region = null;
618 Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$"); 618 Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+[.]?\d*)&(?<y>\d+[.]?\d*)&(?<z>\d+[.]?\d*)$");
619 Match uriMatch = reURI.Match(startLocation); 619 Match uriMatch = reURI.Match(startLocation);
620 if (uriMatch == null) 620 if (uriMatch == null)
621 { 621 {