* Serialized data properly for the InterRegionSingleton InformRegionChild method

* This isn't really that big of a deal(worth lots of commits) doing this, however I'm doing it in small chunks because I'm multi-tasking.

3 files changed, 10 insertions, 6 deletions

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 2c3a8ba..ddaaaf9 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
             AgentID = new LLUUID(cAgent.AgentID);
             SessionID = new LLUUID(cAgent.SessionID);
             SecureSessionID = new LLUUID(cAgent.SecureSessionID);
-            startpos = cAgent.startpos;
+            startpos = new LLVector3(cAgent.startposx,cAgent.startposy,cAgent.startposz);
             firstname = cAgent.firstname;
             lastname = cAgent.lastname;
             circuitcode = cAgent.circuitcode;
@@ -74,7 +74,9 @@ namespace OpenSim.Framework
             AgentID = cAgent.AgentID.UUID;
             SessionID = cAgent.SessionID.UUID;
             SecureSessionID = cAgent.SecureSessionID.UUID;
-            startpos = cAgent.startpos;
+            startposx = cAgent.startpos.X;
+            startposy = cAgent.startpos.Y;
+            startposz = cAgent.startpos.Z;
             firstname = cAgent.firstname;
             lastname = cAgent.lastname;
             circuitcode = cAgent.circuitcode;
@@ -86,7 +88,9 @@ namespace OpenSim.Framework
         public Guid AgentID;
         public Guid SessionID;
         public Guid SecureSessionID;
-        public LLVector3 startpos;
+        public float startposx;
+        public float startposy;
+        public float startposz;
         public string firstname;
         public string lastname;
         public uint circuitcode;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 353dc28..fa776ed 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -501,7 +501,7 @@ namespace OpenSim.Region.Communications.OGS1
 
                     if (remObject != null)
                     {
-                        retValue = remObject.InformRegionOfChildAgent(regionHandle, agentData);
+                        retValue = remObject.InformRegionOfChildAgent(regionHandle, new sAgentCircuitData(agentData));
                     }
                     else
                     {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index d55528c..152107c 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -118,11 +118,11 @@ namespace OpenSim.Region.Communications.OGS1
         {
         }
 
-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        public bool InformRegionOfChildAgent(ulong regionHandle, sAgentCircuitData agentData)
         {
             try
             {
-                return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
+                return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, new AgentCircuitData(agentData));
             }
             catch (RemotingException e)
             {