diff options
author | Marck | 2010-08-06 07:46:19 +0200 |
---|---|---|
committer | Diva Canto | 2010-08-06 17:02:03 -0700 |
commit | 7e47ab746ef588648b8edbbc7cfb48c4d90c5e34 (patch) | |
tree | 0ba450dffb35724504634f88cc21b9c59a983130 /OpenSim/Region/CoreModules | |
parent | Remove old test classes that don't actually test anything not done elsewhere (diff) | |
download | opensim-SC_OLD-7e47ab746ef588648b8edbbc7cfb48c4d90c5e34.zip opensim-SC_OLD-7e47ab746ef588648b8edbbc7cfb48c4d90c5e34.tar.gz opensim-SC_OLD-7e47ab746ef588648b8edbbc7cfb48c4d90c5e34.tar.bz2 opensim-SC_OLD-7e47ab746ef588648b8edbbc7cfb48c4d90c5e34.tar.xz |
Allow creation of link regions if there is an existing region within a 4096 range.
Also add GetHyperlinks() to the grid service.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index b2e3f4f..9ea04d4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -233,6 +233,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
233 | return m_GridService.GetFallbackRegions(scopeID, x, y); | 233 | return m_GridService.GetFallbackRegions(scopeID, x, y); |
234 | } | 234 | } |
235 | 235 | ||
236 | public List<GridRegion> GetHyperlinks(UUID scopeID) | ||
237 | { | ||
238 | return m_GridService.GetHyperlinks(scopeID); | ||
239 | } | ||
240 | |||
236 | public int GetRegionFlags(UUID scopeID, UUID regionID) | 241 | public int GetRegionFlags(UUID scopeID, UUID regionID) |
237 | { | 242 | { |
238 | return m_GridService.GetRegionFlags(scopeID, regionID); | 243 | return m_GridService.GetRegionFlags(scopeID, regionID); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs index 95d8737..1366980 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | |||
@@ -136,6 +136,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests | |||
136 | 900 * (int)Constants.RegionSize, 1100 * (int)Constants.RegionSize); | 136 | 900 * (int)Constants.RegionSize, 1100 * (int)Constants.RegionSize); |
137 | Assert.IsNotNull(results, "Retrieved GetRegionRange list is null"); | 137 | Assert.IsNotNull(results, "Retrieved GetRegionRange list is null"); |
138 | Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected"); | 138 | Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected"); |
139 | |||
140 | results = m_LocalConnector.GetHyperlinks(UUID.Zero); | ||
141 | Assert.IsNotNull(results, "Retrieved GetHyperlinks list is null"); | ||
142 | Assert.That(results.Count, Is.EqualTo(0), "Retrieved linked regions collection is not the number expected"); | ||
143 | |||
139 | } | 144 | } |
140 | } | 145 | } |
141 | } | 146 | } |