aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-06-10 12:01:09 +0000
committerMW2007-06-10 12:01:09 +0000
commit93f07a9fcef3c4b2df15d0f3bac3ea699fd5607e (patch)
tree99147a25c73e76a20bf7a13ad30219b67c5ee271 /OpenSim
parenta couple of changes/fixes (diff)
downloadopensim-SC_OLD-93f07a9fcef3c4b2df15d0f3bac3ea699fd5607e.zip
opensim-SC_OLD-93f07a9fcef3c4b2df15d0f3bac3ea699fd5607e.tar.gz
opensim-SC_OLD-93f07a9fcef3c4b2df15d0f3bac3ea699fd5607e.tar.bz2
opensim-SC_OLD-93f07a9fcef3c4b2df15d0f3bac3ea699fd5607e.tar.xz
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.World/World.cs22
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs3
2 files changed, 19 insertions, 6 deletions
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 7ef06e2..cc2b04e 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -523,7 +523,7 @@ namespace OpenSim.world
523 protected void InformClientOfNeighbours(IClientAPI remoteClient) 523 protected void InformClientOfNeighbours(IClientAPI remoteClient)
524 { 524 {
525 // Console.WriteLine("informing client of neighbouring regions"); 525 // Console.WriteLine("informing client of neighbouring regions");
526 List<RegionInfo> neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo); 526 List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo);
527 527
528 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); 528 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
529 if (neighbours != null) 529 if (neighbours != null)
@@ -535,7 +535,7 @@ namespace OpenSim.world
535 agent.BaseFolder = LLUUID.Zero; 535 agent.BaseFolder = LLUUID.Zero;
536 agent.InventoryFolder = LLUUID.Zero; 536 agent.InventoryFolder = LLUUID.Zero;
537 agent.startpos = new LLVector3(128, 128, 70); 537 agent.startpos = new LLVector3(128, 128, 70);
538 this.commsManager.gridServer.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); 538 this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
539 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); 539 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
540 } 540 }
541 } 541 }
@@ -591,18 +591,26 @@ namespace OpenSim.world
591 591
592 #region RegionCommsHost 592 #region RegionCommsHost
593 593
594 /// <summary>
595 ///
596 /// </summary>
594 public void RegisterRegionWithComms() 597 public void RegisterRegionWithComms()
595 { 598 {
596 this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo); 599 this.regionCommsHost = this.commsManager.RegisterRegion(this.m_regInfo);
597 if (this.regionCommsHost != null) 600 if (this.regionCommsHost != null)
598 { 601 {
599 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); 602 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
600 } 603 }
601 } 604 }
602 605
606 /// <summary>
607 ///
608 /// </summary>
609 /// <param name="regionHandle"></param>
610 /// <param name="agent"></param>
603 public void NewUserConnection(ulong regionHandle, AgentCircuitData agent) 611 public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
604 { 612 {
605 Console.WriteLine("World.cs - add new user connection"); 613 // Console.WriteLine("World.cs - add new user connection");
606 //should just check that its meant for this region 614 //should just check that its meant for this region
607 if (regionHandle == this.m_regInfo.RegionHandle) 615 if (regionHandle == this.m_regInfo.RegionHandle)
608 { 616 {
@@ -612,6 +620,12 @@ namespace OpenSim.world
612 620
613 #endregion 621 #endregion
614 622
623 /// <summary>
624 ///
625 /// </summary>
626 /// <param name="px"></param>
627 /// <param name="py"></param>
628 /// <param name="RemoteClient"></param>
615 public override void SendLayerData(int px, int py, IClientAPI RemoteClient) 629 public override void SendLayerData(int px, int py, IClientAPI RemoteClient)
616 { 630 {
617 RemoteClient.SendLayerData( Terrain.getHeights1D() ); 631 RemoteClient.SendLayerData( Terrain.getHeights1D() );
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 53adce9..a90e14b 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -104,7 +104,6 @@ namespace OpenSim
104 this.checkServer = new CheckSumServer(12036); 104 this.checkServer = new CheckSumServer(12036);
105 this.checkServer.ServerListener(); 105 this.checkServer.ServerListener();
106 this.commsManager = new RegionServerCommsLocal(); 106 this.commsManager = new RegionServerCommsLocal();
107 new RegionServerCommsOGS();
108 } 107 }
109 else 108 else
110 { 109 {
@@ -132,7 +131,7 @@ namespace OpenSim
132 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false); 131 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
133 loginServer.Startup(); 132 loginServer.Startup();
134 //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession); 133 //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession);
135 loginServer.SetSessionHandler(((RegionServerCommsManager)this.commsManager).gridServer.AddNewSession); 134 loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).AddNewSession);
136 //sandbox mode with loginserver not using accounts 135 //sandbox mode with loginserver not using accounts
137 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); 136 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
138 } 137 }