diff options
Diffstat (limited to 'OpenSim/OpenSim.Region/World/World.cs')
-rw-r--r-- | OpenSim/OpenSim.Region/World/World.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs index cf0382a..aad09b3 100644 --- a/OpenSim/OpenSim.Region/World/World.cs +++ b/OpenSim/OpenSim.Region/World/World.cs | |||
@@ -544,7 +544,7 @@ namespace OpenSim.Region | |||
544 | protected void InformClientOfNeighbours(IClientAPI remoteClient) | 544 | protected void InformClientOfNeighbours(IClientAPI remoteClient) |
545 | { | 545 | { |
546 | // Console.WriteLine("informing client of neighbouring regions"); | 546 | // Console.WriteLine("informing client of neighbouring regions"); |
547 | List<RegionInfo> neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo); | 547 | List<RegionInfo> neighbours = this.commsManager.GridServer.RequestNeighbours(this.m_regInfo); |
548 | 548 | ||
549 | //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); | 549 | //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); |
550 | if (neighbours != null) | 550 | if (neighbours != null) |
@@ -556,7 +556,7 @@ namespace OpenSim.Region | |||
556 | agent.BaseFolder = LLUUID.Zero; | 556 | agent.BaseFolder = LLUUID.Zero; |
557 | agent.InventoryFolder = LLUUID.Zero; | 557 | agent.InventoryFolder = LLUUID.Zero; |
558 | agent.startpos = new LLVector3(128, 128, 70); | 558 | agent.startpos = new LLVector3(128, 128, 70); |
559 | this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); | 559 | this.commsManager.InterSims.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); |
560 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); | 560 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); |
561 | } | 561 | } |
562 | } | 562 | } |
@@ -617,7 +617,7 @@ namespace OpenSim.Region | |||
617 | /// </summary> | 617 | /// </summary> |
618 | public void RegisterRegionWithComms() | 618 | public void RegisterRegionWithComms() |
619 | { | 619 | { |
620 | this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo); | 620 | this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo); |
621 | if (this.regionCommsHost != null) | 621 | if (this.regionCommsHost != null) |
622 | { | 622 | { |
623 | this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); | 623 | this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); |