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
             return objdata;

         }

 

-        protected void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort)

+        public void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort)

         {

             EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();

             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
         /// </summary>

         protected void InformClientOfNeighbours(IClientAPI remoteClient)

         {

+           // Console.WriteLine("informing client of neighbouring regions");

             List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo);

 

-

-            for (int i = 0; i < neighbours.Count; i++)

+            //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");

+            if (neighbours != null)

             {

-                AgentCircuitData agent = remoteClient.RequestClientInfo();

-                agent.BaseFolder = LLUUID.Zero;

-                agent.InventoryFolder = LLUUID.Zero;

-                agent.startpos = new LLVector3(128, 128, 70);

-                this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);

+                for (int i = 0; i < neighbours.Count; i++)

+                {

+                   // Console.WriteLine("sending neighbours data");

+                    AgentCircuitData agent = remoteClient.RequestClientInfo();

+                    agent.BaseFolder = LLUUID.Zero;

+                    agent.InventoryFolder = LLUUID.Zero;

+                    agent.startpos = new LLVector3(128, 128, 70);

+                    this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);

+                    remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);

+                }

             }

         }

 

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
         private CheckSumServer checkServer;

         protected RegionServerCommsManager commsManager;

 

+

         public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)

         {

             this.configFileSetup = useConfigFile;

@@ -209,6 +210,7 @@ namespace OpenSim
 

             for (int i = 0; i < configFiles.Length; i++)

             {

+                regionDat = new RegionInfo();

                 if (m_sandbox)

                 {

                     AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();

@@ -259,7 +261,7 @@ namespace OpenSim
 

         protected override void SetupHttpListener()

         {

-            httpServer = new BaseHttpServer(regionData[0].IPListenPort);

+            httpServer = new BaseHttpServer(9000); //regionData[0].IPListenPort);

 

             if (!this.m_sandbox)

             {