diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 3f17ca8eaa..2c3a8ba49d 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -30,12 +30,25 @@ using libsecondlife;
 
 namespace OpenSim.Framework
 {
-    [Serializable]
     public class AgentCircuitData
     {
         public AgentCircuitData()
         {
         }
+        public AgentCircuitData(sAgentCircuitData cAgent)
+        {
+            AgentID = new LLUUID(cAgent.AgentID);
+            SessionID = new LLUUID(cAgent.SessionID);
+            SecureSessionID = new LLUUID(cAgent.SecureSessionID);
+            startpos = cAgent.startpos;
+            firstname = cAgent.firstname;
+            lastname = cAgent.lastname;
+            circuitcode = cAgent.circuitcode;
+            child = cAgent.child;
+            InventoryFolder = new LLUUID(cAgent.InventoryFolder);
+            BaseFolder = new LLUUID(cAgent.BaseFolder);
+            CapsPath = cAgent.CapsPath;
+        }
 
         public LLUUID AgentID;
         public LLUUID SessionID;
@@ -49,4 +62,40 @@ namespace OpenSim.Framework
         public LLUUID BaseFolder;
         public string CapsPath = "";
     }
+
+    [Serializable]
+    public class sAgentCircuitData
+    {
+        public sAgentCircuitData()
+        {
+        }
+        public sAgentCircuitData(AgentCircuitData cAgent)
+        {
+            AgentID = cAgent.AgentID.UUID;
+            SessionID = cAgent.SessionID.UUID;
+            SecureSessionID = cAgent.SecureSessionID.UUID;
+            startpos = cAgent.startpos;
+            firstname = cAgent.firstname;
+            lastname = cAgent.lastname;
+            circuitcode = cAgent.circuitcode;
+            child = cAgent.child;
+            InventoryFolder = cAgent.InventoryFolder.UUID;
+            BaseFolder = cAgent.BaseFolder.UUID;
+            CapsPath = cAgent.CapsPath;
+        }
+        public Guid AgentID;
+        public Guid SessionID;
+        public Guid SecureSessionID;
+        public LLVector3 startpos;
+        public string firstname;
+        public string lastname;
+        public uint circuitcode;
+        public bool child;
+        public Guid InventoryFolder;
+        public Guid BaseFolder;
+        public string CapsPath = "";
+       
+
+
+    }
 }
\ No newline at end of file