diff options
| author | Melanie | 2010-07-08 17:32:57 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-08 17:32:57 +0100 |
| commit | 5f400a50beb2b9d523e5a0fac643ca1cb247c9a6 (patch) | |
| tree | da874e34ef1c790f9b8ce9dc0533ac98755d783c /OpenSim/Services/GridService | |
| parent | minimizes temp garbage for llParseStringKeepNulls() (diff) | |
| parent | llVecNorm() now returns a zero-length vector when one is supplied as input. A... (diff) | |
| download | opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.zip opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.gz opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.bz2 opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/GridService')
| -rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 225530f..46d72dc 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
| @@ -278,7 +278,11 @@ namespace OpenSim.Services.GridService | |||
| 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 | { |
| 282 | int flags = Convert.ToInt32(rdata.Data["flags"]); | ||
| 283 | if ((flags & (int)Data.RegionFlags.Hyperlink) == 0) // no hyperlinks as neighbours | ||
| 284 | rinfos.Add(RegionData2RegionInfo(rdata)); | ||
| 285 | } | ||
| 282 | 286 | ||
| 283 | } | 287 | } |
| 284 | m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count); | 288 | m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count); |