diff options
| author | Melanie | 2011-01-29 04:47:32 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-29 04:47:32 +0000 |
| commit | 24a768a99b5de94042c7e170cc8aad83ec3a1ebc (patch) | |
| tree | 388c6fca95fda2e69550c7690659339915c590f9 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Significantly increase the total number of URL's available. In second life, ... (diff) | |
| parent | Flash out the prim count module (diff) | |
| download | opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.zip opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.gz opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.bz2 opensim-SC-24a768a99b5de94042c7e170cc8aad83ec3a1ebc.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 3f0393d..cf059b3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -711,7 +711,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 711 | // and convert the regionName to the target region | 711 | // and convert the regionName to the target region |
| 712 | if (regionName.Contains(".") && regionName.Contains(":")) | 712 | if (regionName.Contains(".") && regionName.Contains(":")) |
| 713 | { | 713 | { |
| 714 | List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); | 714 | // List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); |
| 715 | string[] parts = regionName.Split(new char[] { ':' }); | 715 | string[] parts = regionName.Split(new char[] { ':' }); |
| 716 | if (parts.Length > 2) | 716 | if (parts.Length > 2) |
| 717 | regionName = parts[0] + ':' + parts[1] + "/ " + parts[2]; | 717 | regionName = parts[0] + ':' + parts[1] + "/ " + parts[2]; |