aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs2
-rw-r--r--OpenSim/OpenSim.World/World.cs20
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs4
3 files changed, 17 insertions, 9 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index e14b7b7..89c1f61 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -374,7 +374,7 @@ namespace OpenSim
374 return objdata; 374 return objdata;
375 } 375 }
376 376
377 protected void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort) 377 public void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort)
378 { 378 {
379 EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket(); 379 EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
380 enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock(); 380 enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
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
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 66aadb0..7c83dee 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -61,6 +61,7 @@ namespace OpenSim
61 private CheckSumServer checkServer; 61 private CheckSumServer checkServer;
62 protected RegionServerCommsManager commsManager; 62 protected RegionServerCommsManager commsManager;
63 63
64
64 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile) 65 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
65 { 66 {
66 this.configFileSetup = useConfigFile; 67 this.configFileSetup = useConfigFile;
@@ -209,6 +210,7 @@ namespace OpenSim
209 210
210 for (int i = 0; i < configFiles.Length; i++) 211 for (int i = 0; i < configFiles.Length; i++)
211 { 212 {
213 regionDat = new RegionInfo();
212 if (m_sandbox) 214 if (m_sandbox)
213 { 215 {
214 AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal(); 216 AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
@@ -259,7 +261,7 @@ namespace OpenSim
259 261
260 protected override void SetupHttpListener() 262 protected override void SetupHttpListener()
261 { 263 {
262 httpServer = new BaseHttpServer(regionData[0].IPListenPort); 264 httpServer = new BaseHttpServer(9000); //regionData[0].IPListenPort);
263 265
264 if (!this.m_sandbox) 266 if (!this.m_sandbox)
265 { 267 {