diff options
| author | Melanie | 2011-02-16 02:41:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-16 02:41:49 +0000 |
| commit | ccd6e5d07146b8dd033bd1af09594834e87a883b (patch) | |
| tree | e7ed9506d70d67c37ac8d40f9620cbaa24747305 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Add the country functions in the careminster API (diff) | |
| parent | Catch HttpServer exception: mantis #5381 (diff) | |
| download | opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.zip opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.gz opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.bz2 opensim-SC-ccd6e5d07146b8dd033bd1af09594834e87a883b.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, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 4d299d6..c2e5c13 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -711,6 +711,8 @@ 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 | // Even though we use none of the results, we need to perform this call because it appears | ||
| 715 | // to have some the side effect of setting up hypergrid teleport locations. | ||
| 714 | World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); | 716 | World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); |
| 715 | // List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); | 717 | // List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1); |
| 716 | 718 | ||