diff options
| author | Melanie | 2011-01-28 23:22:16 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-28 23:22:16 +0000 |
| commit | 38bfdb0c9d8946790a5e3a120283f29c04803269 (patch) | |
| tree | 9746c6ac41044b7e66fefd85b1ddf6f263f847c0 /OpenSim/Region/ScriptEngine | |
| parent | Add the prim count interfaces (diff) | |
| parent | Comment out unused call to GridService in TeleportAgent() (diff) | |
| download | opensim-SC-38bfdb0c9d8946790a5e3a120283f29c04803269.zip opensim-SC-38bfdb0c9d8946790a5e3a120283f29c04803269.tar.gz opensim-SC-38bfdb0c9d8946790a5e3a120283f29c04803269.tar.bz2 opensim-SC-38bfdb0c9d8946790a5e3a120283f29c04803269.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -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 bca08fb..c0c790d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -702,7 +702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 702 | // and convert the regionName to the target region | 702 | // and convert the regionName to the target region |
| 703 | if (regionName.Contains(".") && regionName.Contains(":")) | 703 | if (regionName.Contains(".") && regionName.Contains(":")) |
| 704 | { | 704 | { |
| 705 | List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); | 705 | // List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); |
| 706 | string[] parts = regionName.Split(new char[] { ':' }); | 706 | string[] parts = regionName.Split(new char[] { ':' }); |
| 707 | if (parts.Length > 2) | 707 | if (parts.Length > 2) |
| 708 | regionName = parts[0] + ':' + parts[1] + "/ " + parts[2]; | 708 | regionName = parts[0] + ':' + parts[1] + "/ " + parts[2]; |