Minor fix for HG request neighbors. Should not return hyperlink neighbors, only neighbors on the same grid. I'm still not sure if this is a bug or a feature, so this may change again.

My first commit of 2009 -- Happy New Year!

2 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index b085774..83c087d 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -105,8 +105,8 @@ namespace OpenSim.Region.Communications.Hypergrid
         public override List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
         {
             List<SimpleRegionInfo> neighbours = m_remoteBackend.RequestNeighbours(x, y);
-            List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y);
-            neighbours.AddRange(remotes);
+            //List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y);
+            //neighbours.AddRange(remotes);
 
             return neighbours;
         }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 329bae5..cabc630 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -115,8 +115,8 @@ namespace OpenSim.Region.Communications.Hypergrid
         public override List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
         {
             List<SimpleRegionInfo> neighbours = m_localBackend.RequestNeighbours(x, y);
-            List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y);
-            neighbours.AddRange(remotes);
+            //List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y);
+            //neighbours.AddRange(remotes);
     
             return neighbours;
         }