diff options
| author | Diva Canto | 2014-11-21 08:54:30 -0800 |
|---|---|---|
| committer | Diva Canto | 2014-11-21 08:54:30 -0800 |
| commit | 8d3cb424a8730a0d0cdea42e513057c2c3fff679 (patch) | |
| tree | 611eb8cd3c3526e1f41058ed000e1c3f9f644cf8 /OpenSim/Services | |
| parent | Cleanup extraneous comments from viewer support modules (diff) | |
| parent | LSL key should be implicitly cast to a boolean value (diff) | |
| download | opensim-SC_OLD-8d3cb424a8730a0d0cdea42e513057c2c3fff679.zip opensim-SC_OLD-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.gz opensim-SC_OLD-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.bz2 opensim-SC_OLD-8d3cb424a8730a0d0cdea42e513057c2c3fff679.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
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 | { |