diff options
author | mingchen | 2007-06-09 21:04:13 +0000 |
---|---|---|
committer | mingchen | 2007-06-09 21:04:13 +0000 |
commit | fa8f143aec69e36ee90fb34e2f144733b66ca951 (patch) | |
tree | 9442f049f83b4ea1cb89f9205aa07fd375c84594 /OpenSim/OpenSim.World/World.cs | |
parent | Number of small changes. (diff) | |
download | opensim-SC_OLD-fa8f143aec69e36ee90fb34e2f144733b66ca951.zip opensim-SC_OLD-fa8f143aec69e36ee90fb34e2f144733b66ca951.tar.gz opensim-SC_OLD-fa8f143aec69e36ee90fb34e2f144733b66ca951.tar.bz2 opensim-SC_OLD-fa8f143aec69e36ee90fb34e2f144733b66ca951.tar.xz |
*Reorganized RegionServerCommsManager for OGS and local support
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.World/World.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs index 3e74501..011e39a 100644 --- a/OpenSim/OpenSim.World/World.cs +++ b/OpenSim/OpenSim.World/World.cs | |||
@@ -524,7 +524,7 @@ namespace OpenSim.world | |||
524 | protected void InformClientOfNeighbours(IClientAPI remoteClient) | 524 | protected void InformClientOfNeighbours(IClientAPI remoteClient) |
525 | { | 525 | { |
526 | // Console.WriteLine("informing client of neighbouring regions"); | 526 | // Console.WriteLine("informing client of neighbouring regions"); |
527 | List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo); | 527 | List<RegionInfo> neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo); |
528 | 528 | ||
529 | //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); | 529 | //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); |
530 | if (neighbours != null) | 530 | if (neighbours != null) |
@@ -536,7 +536,7 @@ namespace OpenSim.world | |||
536 | agent.BaseFolder = LLUUID.Zero; | 536 | agent.BaseFolder = LLUUID.Zero; |
537 | agent.InventoryFolder = LLUUID.Zero; | 537 | agent.InventoryFolder = LLUUID.Zero; |
538 | agent.startpos = new LLVector3(128, 128, 70); | 538 | agent.startpos = new LLVector3(128, 128, 70); |
539 | this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); | 539 | this.commsManager.gridServer.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); |
540 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); | 540 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); |
541 | } | 541 | } |
542 | } | 542 | } |
@@ -594,7 +594,7 @@ namespace OpenSim.world | |||
594 | 594 | ||
595 | public void RegisterRegionWithComms() | 595 | public void RegisterRegionWithComms() |
596 | { | 596 | { |
597 | this.regionCommsHost = this.commsManager.RegisterRegion(this.m_regInfo); | 597 | this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo); |
598 | if (this.regionCommsHost != null) | 598 | if (this.regionCommsHost != null) |
599 | { | 599 | { |
600 | this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); | 600 | this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); |