Border crossing back to mostly working, still seems a problem in that you need to stop walking just after you cross the border for it to work properly (else you will continue moving into a negative position in the first sim)

7 files changed, 47 insertions, 33 deletions

diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index f784f54..91bc54d 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
@@ -81,8 +81,29 @@ namespace OpenSim
                 this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;

                 this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;

                 this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;

+               // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);

+

+            }

+

+        }

+

+        public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)

+        {

+            if (this.AgentCircuits.ContainsKey(circuitcode))

+            {

+                this.AgentCircuits[circuitcode].child = childstatus;

+

+            }

+        }

+

+        public bool GetAgentChildStatus(uint circuitcode)

+        {

+            if (this.AgentCircuits.ContainsKey(circuitcode))

+            {

+                return this.AgentCircuits[circuitcode].child;

+

             }

-           

+            return false;

         }

     }

 }

diff --git a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 57c98e4..0802d75 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
@@ -34,6 +34,8 @@ namespace OpenSim
             {

                 agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));

                 agentData.child = false;

+               // Console.WriteLine("expect user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);

+          

             }

 

             this.AddNewCircuit(agentData.circuitcode, agentData);

diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index daaa6dd..9ae08f4 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -118,7 +118,9 @@ namespace OpenSim
 

             if (m_gridServer.GetName() == "Remote")

             {

+                this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code);

                 this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);

+                //Console.WriteLine("start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);

             }

             else

             {

@@ -142,13 +144,15 @@ namespace OpenSim
         # region Client Methods

         public void UpgradeClient()

         {

+            Console.WriteLine("updateclient being called");

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent");

             this.m_child = false;

             this.m_world.RemoveViewerAgent(this);

             if (!this.m_sandboxMode)

             {

-                this.startpos = ((RemoteGridBase)m_gridServer).agentcircuits[CircuitCode].startpos;

-                ((RemoteGridBase)m_gridServer).agentcircuits[CircuitCode].child = false;

+                this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);

+                m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);

+                //Console.WriteLine("upgrade start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);

             }

             this.InitNewClient();

         }

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 72214d4..ecf9c69 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -585,7 +585,7 @@ namespace OpenSim.world
                 }

                 if (agentClient.ClientAvatar.PhysActor != null)

                 {

-                    this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor);

+                    //this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor);

                 }

             }

             catch (Exception e)

diff --git a/OpenSim.Servers/CheckSumServer.cs b/OpenSim.Servers/CheckSumServer.cs
index f0b4124..ae1724f 100644
--- a/OpenSim.Servers/CheckSumServer.cs
+++ b/OpenSim.Servers/CheckSumServer.cs
@@ -17,12 +17,11 @@ namespace OpenSim.Servers
 {

     public class CheckSumServer : UDPServerBase

     {

-        protected ConsoleBase m_console;

+        //protected ConsoleBase m_console;

 

-        public CheckSumServer(int port, ConsoleBase console)

+        public CheckSumServer(int port)

+            : base(port)

         {

-            listenPort = port;

-            this.m_console = console;

         }

 

         protected override void OnReceivedData(IAsyncResult result)

@@ -35,10 +34,8 @@ namespace OpenSim.Servers
 

             packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);

 

-            // do we already have a circuit for this endpoint

             if (packet.Type == PacketType.SecuredTemplateChecksumRequest)

             {

-

                 SecuredTemplateChecksumRequestPacket checksum = (SecuredTemplateChecksumRequestPacket)packet;

                 TemplateChecksumReplyPacket checkreply = new TemplateChecksumReplyPacket();

                 checkreply.DataBlock.Checksum = 180572585;

@@ -55,23 +52,21 @@ namespace OpenSim.Servers
                 SecuredTemplateChecksumRequestPacket checkrequest = new SecuredTemplateChecksumRequestPacket();

                 checkrequest.TokenBlock.Token = checksum.TokenBlock.Token;

                 this.SendPacket(checkrequest, epSender);

-                 */

-

+                */

             }

             else if (packet.Type == PacketType.TemplateChecksumReply)

             {

                 //echo back the client checksum reply (Hegemon's method)

-                TemplateChecksumReplyPacket checksum = (TemplateChecksumReplyPacket)packet;

+                TemplateChecksumReplyPacket checksum2 = (TemplateChecksumReplyPacket)packet;

                 TemplateChecksumReplyPacket checkreply2 = new TemplateChecksumReplyPacket();

-                checkreply2.DataBlock.Checksum = checksum.DataBlock.Checksum;

-                checkreply2.DataBlock.Flags = checksum.DataBlock.Flags;

-                checkreply2.DataBlock.MajorVersion = checksum.DataBlock.MajorVersion;

-                checkreply2.DataBlock.MinorVersion = checksum.DataBlock.MinorVersion;

-                checkreply2.DataBlock.PatchVersion = checksum.DataBlock.PatchVersion;

-                checkreply2.DataBlock.ServerVersion = checksum.DataBlock.ServerVersion;

-                checkreply2.TokenBlock.Token = checksum.TokenBlock.Token;

+                checkreply2.DataBlock.Checksum = checksum2.DataBlock.Checksum;

+                checkreply2.DataBlock.Flags = checksum2.DataBlock.Flags;

+                checkreply2.DataBlock.MajorVersion = checksum2.DataBlock.MajorVersion;

+                checkreply2.DataBlock.MinorVersion = checksum2.DataBlock.MinorVersion;

+                checkreply2.DataBlock.PatchVersion = checksum2.DataBlock.PatchVersion;

+                checkreply2.DataBlock.ServerVersion = checksum2.DataBlock.ServerVersion;

+                checkreply2.TokenBlock.Token = checksum2.TokenBlock.Token;

                 this.SendPacket(checkreply2, epSender);

-

             }

             else

             {

@@ -80,16 +75,13 @@ namespace OpenSim.Servers
             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

         }

 

-

         private void SendPacket(Packet Pack, EndPoint endp)

         {

             if (!Pack.Header.Resent)

             {

-                // Set the sequence number

-

                 Pack.Header.Sequence = 1;

-

             }

+

             byte[] ZeroOutBuffer = new byte[4096];

             byte[] sendbuffer;

             sendbuffer = Pack.ToBytes();

diff --git a/OpenSim.Servers/UDPServerBase.cs b/OpenSim.Servers/UDPServerBase.cs
index e7feb01..a308052 100644
--- a/OpenSim.Servers/UDPServerBase.cs
+++ b/OpenSim.Servers/UDPServerBase.cs
@@ -24,8 +24,9 @@ namespace OpenSim.Servers
         protected AsyncCallback ReceivedData;

         protected int listenPort;

 

-        public UDPServerBase()

+        public UDPServerBase(int port)

         {

+            listenPort = port;

         }

 

         protected virtual void OnReceivedData(IAsyncResult result)

@@ -38,8 +39,6 @@ namespace OpenSim.Servers
 

             packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);

 

-

-

             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

         }

 

@@ -60,14 +59,10 @@ namespace OpenSim.Servers
             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

         }

 

-

         public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)

         {

-            // find the endpoint for this circuit

 

         }

-

-

     }

 }

 

diff --git a/OpenSim/OpenSimMain.cs b/OpenSim/OpenSimMain.cs
index 30fed30..9025316 100644
--- a/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSimMain.cs
@@ -100,7 +100,7 @@ namespace OpenSim
                 //Authenticate Session Handler

                 AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();

                 this.AuthenticateSessionsHandler = authen;

-                this.checkServer = new CheckSumServer(12036, m_console);

+                this.checkServer = new CheckSumServer(12036);

                 this.checkServer.ServerListener();

             }

             else