From 7525f3a556116e47f629e09b42dd4753185166e2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Jul 2010 04:19:53 -0700
Subject: 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.

---
 OpenSim/Services/GridService/GridService.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/GridService')

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
 
                 foreach (RegionData rdata in rdatas)
                     if (rdata.RegionID != regionID)
-                        rinfos.Add(RegionData2RegionInfo(rdata));
+                    {
+                        int flags = Convert.ToInt32(rdata.Data["flags"]);
+                        if ((flags & (int)Data.RegionFlags.Hyperlink) == 0) // no hyperlinks as neighbours
+                            rinfos.Add(RegionData2RegionInfo(rdata));
+                    }
 
             }
             m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count);
-- 
cgit v1.1