diff options
author | Diva Canto | 2010-08-06 17:43:09 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-06 17:43:09 -0700 |
commit | 009053479302e7581a85c7574a6cc8eaa23745d8 (patch) | |
tree | 7b11018e7368719d40f75d475db45777e6fecf2b /OpenSim/Region | |
parent | Allow creation of link regions if there is an existing region within a 4096 r... (diff) | |
download | opensim-SC-009053479302e7581a85c7574a6cc8eaa23745d8.zip opensim-SC-009053479302e7581a85c7574a6cc8eaa23745d8.tar.gz opensim-SC-009053479302e7581a85c7574a6cc8eaa23745d8.tar.bz2 opensim-SC-009053479302e7581a85c7574a6cc8eaa23745d8.tar.xz |
Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker.
ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 9ea04d4..023a44c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -233,10 +233,10 @@ 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) | 236 | public List<GridRegion> GetHyperlinks(UUID scopeID) |
237 | { | 237 | { |
238 | return m_GridService.GetHyperlinks(scopeID); | 238 | return m_GridService.GetHyperlinks(scopeID); |
239 | } | 239 | } |
240 | 240 | ||
241 | public int GetRegionFlags(UUID scopeID, UUID regionID) | 241 | public int GetRegionFlags(UUID scopeID, UUID regionID) |
242 | { | 242 | { |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs index 1366980..2726ae8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | |||
@@ -136,9 +136,9 @@ 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 | 139 | ||
140 | results = m_LocalConnector.GetHyperlinks(UUID.Zero); | 140 | results = m_LocalConnector.GetHyperlinks(UUID.Zero); |
141 | Assert.IsNotNull(results, "Retrieved GetHyperlinks list is null"); | 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"); | 142 | Assert.That(results.Count, Is.EqualTo(0), "Retrieved linked regions collection is not the number expected"); |
143 | 143 | ||
144 | } | 144 | } |