From b9f870fa73d18de15b8a2d067e65366ab624be2b Mon Sep 17 00:00:00 2001
From: AliciaRaven <alicia@spellscape.co.uk>
Date: Fri, 14 Nov 2014 21:55:52 +0000
Subject: [PATCH] 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.

---
 OpenSim/Services/LLLoginService/LLLoginService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index b1aabe6b93..d2ff29256c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -615,7 +615,7 @@ namespace OpenSim.Services.LLLoginService
                 // e.g. New Moon&135&46  New Moon@osgrid.org:8002&153&34
                 where = "url";
                 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);
                 if (uriMatch == null)
                 {