aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-02-05 00:15:25 +0000
committerJustin Clark-Casey (justincc)2011-02-05 00:15:25 +0000
commitcdd64bb8f51df51858b841de4def7808735b02dd (patch)
tree72b7d6dfc1cb5beac5b932f309633cb89c446b55 /OpenSim
parentminor: remove some mono compiler warnings (diff)
downloadopensim-SC_OLD-cdd64bb8f51df51858b841de4def7808735b02dd.zip
opensim-SC_OLD-cdd64bb8f51df51858b841de4def7808735b02dd.tar.gz
opensim-SC_OLD-cdd64bb8f51df51858b841de4def7808735b02dd.tar.bz2
opensim-SC_OLD-cdd64bb8f51df51858b841de4def7808735b02dd.tar.xz
For now, reinstate the call to World.GridService.GetRegionsByName() commented out in 933f47e
Even though we don't use the results, just getting the regions may have side effects in making hypergrid links available for the later World.RequestTeleportLocation()
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
1 files changed, 3 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 c0c790d..3f8735e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -702,7 +702,9 @@ 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 World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
706// List<GridRegion> regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
707
706 string[] parts = regionName.Split(new char[] { ':' }); 708 string[] parts = regionName.Split(new char[] { ':' });
707 if (parts.Length > 2) 709 if (parts.Length > 2)
708 regionName = parts[0] + ':' + parts[1] + "/ " + parts[2]; 710 regionName = parts[0] + ':' + parts[1] + "/ " + parts[2];