diff options
author | Melanie | 2010-06-14 04:50:27 +0100 |
---|---|---|
committer | Melanie | 2010-06-14 04:50:27 +0100 |
commit | c75b94f9f9afe3ad384f326db9d54e6bff3bde91 (patch) | |
tree | ea10bef43fd64e95048b953ac9bb65976911881a /OpenSim/Services/GridService | |
parent | Merge branch 'master' into 0.7-post-fixes (diff) | |
parent | Fixes attachments coming back upon being detached in neighbouring regions and... (diff) | |
download | opensim-SC-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.zip opensim-SC-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.gz opensim-SC-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.bz2 opensim-SC-c75b94f9f9afe3ad384f326db9d54e6bff3bde91.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 7c98642..225530f 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -273,14 +273,15 @@ namespace OpenSim.Services.GridService | |||
273 | if (region != null) | 273 | if (region != null) |
274 | { | 274 | { |
275 | // Not really? Maybe? | 275 | // Not really? Maybe? |
276 | List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize, region.posY - (int)Constants.RegionSize, | 276 | List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize - 1, region.posY - (int)Constants.RegionSize - 1, |
277 | region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID); | 277 | region.posX + (int)Constants.RegionSize + 1, region.posY + (int)Constants.RegionSize + 1, scopeID); |
278 | 278 | ||
279 | foreach (RegionData rdata in rdatas) | 279 | foreach (RegionData rdata in rdatas) |
280 | if (rdata.RegionID != regionID) | 280 | if (rdata.RegionID != regionID) |
281 | rinfos.Add(RegionData2RegionInfo(rdata)); | 281 | rinfos.Add(RegionData2RegionInfo(rdata)); |
282 | 282 | ||
283 | } | 283 | } |
284 | m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count); | ||
284 | return rinfos; | 285 | return rinfos; |
285 | } | 286 | } |
286 | 287 | ||