aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2009-01-01 19:29:30 +0000
committerdiva2009-01-01 19:29:30 +0000
commitba9d9a90198437b23e45994620d1f639f58f7fa9 (patch)
tree49cd6cf86367da2ea2e0d41c58f51d5725726134 /OpenSim
parentBeginning of true REST style for interregion comms, SendChildAgentUpdate only... (diff)
downloadopensim-SC_OLD-ba9d9a90198437b23e45994620d1f639f58f7fa9.zip
opensim-SC_OLD-ba9d9a90198437b23e45994620d1f639f58f7fa9.tar.gz
opensim-SC_OLD-ba9d9a90198437b23e45994620d1f639f58f7fa9.tar.bz2
opensim-SC_OLD-ba9d9a90198437b23e45994620d1f639f58f7fa9.tar.xz
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!
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs4
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
105 public override List<SimpleRegionInfo> RequestNeighbours(uint x, uint y) 105 public override List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
106 { 106 {
107 List<SimpleRegionInfo> neighbours = m_remoteBackend.RequestNeighbours(x, y); 107 List<SimpleRegionInfo> neighbours = m_remoteBackend.RequestNeighbours(x, y);
108 List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y); 108 //List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y);
109 neighbours.AddRange(remotes); 109 //neighbours.AddRange(remotes);
110 110
111 return neighbours; 111 return neighbours;
112 } 112 }
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
115 public override List<SimpleRegionInfo> RequestNeighbours(uint x, uint y) 115 public override List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
116 { 116 {
117 List<SimpleRegionInfo> neighbours = m_localBackend.RequestNeighbours(x, y); 117 List<SimpleRegionInfo> neighbours = m_localBackend.RequestNeighbours(x, y);
118 List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y); 118 //List<SimpleRegionInfo> remotes = base.RequestNeighbours(x, y);
119 neighbours.AddRange(remotes); 119 //neighbours.AddRange(remotes);
120 120
121 return neighbours; 121 return neighbours;
122 } 122 }