aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.Region/Scenes/Scene.cs')
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index ad6d336..62edc4b 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -704,7 +704,8 @@ namespace OpenSim.Region.Scenes
704 /// </summary> 704 /// </summary>
705 public void RegisterRegionWithComms() 705 public void RegisterRegionWithComms()
706 { 706 {
707 this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo); 707 GridInfo gridSettings = new GridInfo();
708 this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);
708 if (this.regionCommsHost != null) 709 if (this.regionCommsHost != null)
709 { 710 {
710 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); 711 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
@@ -726,7 +727,7 @@ namespace OpenSim.Region.Scenes
726 if (agent.CapsPath != "") 727 if (agent.CapsPath != "")
727 { 728 {
728 //Console.WriteLine("new user, so creating caps handler for it"); 729 //Console.WriteLine("new user, so creating caps handler for it");
729 Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.IPListenAddr, 9000, agent.CapsPath, agent.AgentID); 730 Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
730 cap.RegisterHandlers(); 731 cap.RegisterHandlers();
731 this.capsHandlers.Add(cap); 732 this.capsHandlers.Add(cap);
732 } 733 }
@@ -765,7 +766,7 @@ namespace OpenSim.Region.Scenes
765 agent.startpos = new LLVector3(128, 128, 70); 766 agent.startpos = new LLVector3(128, 128, 70);
766 agent.child = true; 767 agent.child = true;
767 this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent); 768 this.commsManager.InterRegion.InformRegionOfChildAgent(neighbours[i].RegionHandle, agent);
768 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); 769 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].CommsIPListenAddr), (ushort)neighbours[i].CommsIPListenPort);
769 } 770 }
770 } 771 }
771 } 772 }
@@ -826,7 +827,7 @@ namespace OpenSim.Region.Scenes
826 agent.child = true; 827 agent.child = true;
827 this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); 828 this.commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
828 this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position); 829 this.commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position);
829 remoteClient.SendRegionTeleport(regionHandle, 13, reg.IPListenAddr, (ushort)reg.IPListenPort, 4, (1 << 4)); 830 remoteClient.SendRegionTeleport(regionHandle, 13, reg.CommsIPListenAddr, (ushort)reg.CommsIPListenPort, 4, (1 << 4));
830 } 831 }
831 //remoteClient.SendTeleportCancel(); 832 //remoteClient.SendTeleportCancel();
832 } 833 }