diff options
author | Diva Canto | 2010-07-05 04:19:53 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-05 04:20:51 -0700 |
commit | 40d169992a0a899ccefa95170b215c8f56e15bea (patch) | |
tree | 28700fb54cd4a8bb8ce09e027d852cf731f02c60 | |
parent | One more buglet fixed related to mantis #4841 -- auto-returns were still choc... (diff) | |
download | opensim-SC_OLD-40d169992a0a899ccefa95170b215c8f56e15bea.zip opensim-SC_OLD-40d169992a0a899ccefa95170b215c8f56e15bea.tar.gz opensim-SC_OLD-40d169992a0a899ccefa95170b215c8f56e15bea.tar.bz2 opensim-SC_OLD-40d169992a0a899ccefa95170b215c8f56e15bea.tar.xz |
Don't include hyperlinks as neighbors, even if grid operators have done the mistake of placing them as neighbors. This will not prevent further mess ups coming from that unsupported action.
Diffstat (limited to '')
-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); |