aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.World/World.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.World/World.cs')
-rw-r--r--OpenSim/OpenSim.World/World.cs20
1 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 2c5971d..1d56ea3 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -504,16 +504,22 @@ namespace OpenSim.world
504 /// </summary> 504 /// </summary>
505 protected void InformClientOfNeighbours(IClientAPI remoteClient) 505 protected void InformClientOfNeighbours(IClientAPI remoteClient)
506 { 506 {
507 // Console.WriteLine("informing client of neighbouring regions");
507 List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo); 508 List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo);
508 509
509 510 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
510 for (int i = 0; i < neighbours.Count; i++) 511 if (neighbours != null)
511 { 512 {
512 AgentCircuitData agent = remoteClient.RequestClientInfo(); 513 for (int i = 0; i < neighbours.Count; i++)
513 agent.BaseFolder = LLUUID.Zero; 514 {
514 agent.InventoryFolder = LLUUID.Zero; 515 // Console.WriteLine("sending neighbours data");
515 agent.startpos = new LLVector3(128, 128, 70); 516 AgentCircuitData agent = remoteClient.RequestClientInfo();
516 this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); 517 agent.BaseFolder = LLUUID.Zero;
518 agent.InventoryFolder = LLUUID.Zero;
519 agent.startpos = new LLVector3(128, 128, 70);
520 this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
521 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
522 }
517 } 523 }
518 } 524 }
519 525