1 files changed, 113 insertions, 10 deletions

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index c0168e2..353e5bf 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -75,6 +75,11 @@ namespace OpenSim.Framework
         public uint circuitcode;
 
         /// <summary>
+        /// How this agent got here
+        /// </summary>
+        public uint teleportFlags;
+
+        /// <summary>
         /// Agent's account first name
         /// </summary>
         public string firstname;
@@ -97,10 +102,18 @@ namespace OpenSim.Framework
         public UUID SessionID;
 
         /// <summary>
+        /// Hypergrid service token; generated by the user domain, consumed by the receiving grid.
+        /// There is one such unique token for each grid visited.
+        /// </summary>
+        public string ServiceSessionID = string.Empty;
+
+        /// <summary>
         /// Position the Agent's Avatar starts in the region
         /// </summary>
         public Vector3 startpos;
 
+        public Dictionary<string, object> ServiceURLs;
+
         public AgentCircuitData()
         {
         }
@@ -136,17 +149,19 @@ namespace OpenSim.Framework
             args["base_folder"] = OSD.FromUUID(BaseFolder);
             args["caps_path"] = OSD.FromString(CapsPath);
 
-            OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count);
-            foreach (KeyValuePair<ulong, string> kvp in ChildrenCapSeeds)
+            if (ChildrenCapSeeds != null)
             {
-                OSDMap pair = new OSDMap();
-                pair["handle"] = OSD.FromString(kvp.Key.ToString());
-                pair["seed"] = OSD.FromString(kvp.Value);
-                childrenSeeds.Add(pair);
+                OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count);
+                foreach (KeyValuePair<ulong, string> kvp in ChildrenCapSeeds)
+                {
+                    OSDMap pair = new OSDMap();
+                    pair["handle"] = OSD.FromString(kvp.Key.ToString());
+                    pair["seed"] = OSD.FromString(kvp.Value);
+                    childrenSeeds.Add(pair);
+                }
+                if (ChildrenCapSeeds.Count > 0)
+                    args["children_seeds"] = childrenSeeds;
             }
-            if (ChildrenCapSeeds.Count > 0)
-                args["children_seeds"] = childrenSeeds;
-
             args["child"] = OSD.FromBoolean(child);
             args["circuit_code"] = OSD.FromString(circuitcode.ToString());
             args["first_name"] = OSD.FromString(firstname);
@@ -154,7 +169,52 @@ namespace OpenSim.Framework
             args["inventory_folder"] = OSD.FromUUID(InventoryFolder);
             args["secure_session_id"] = OSD.FromUUID(SecureSessionID);
             args["session_id"] = OSD.FromUUID(SessionID);
+            
+            args["service_session_id"] = OSD.FromString(ServiceSessionID);
             args["start_pos"] = OSD.FromString(startpos.ToString());
+            args["appearance_serial"] = OSD.FromInteger(Appearance.Serial);
+
+            if (Appearance != null)
+            {
+                //System.Console.WriteLine("XXX Before packing Wearables");
+                if ((Appearance.Wearables != null) && (Appearance.Wearables.Length > 0))
+                {
+                    OSDArray wears = new OSDArray(Appearance.Wearables.Length * 2);
+                    foreach (AvatarWearable awear in Appearance.Wearables)
+                    {
+                        wears.Add(OSD.FromUUID(awear.ItemID));
+                        wears.Add(OSD.FromUUID(awear.AssetID));
+                        //System.Console.WriteLine("XXX ItemID=" + awear.ItemID + " assetID=" + awear.AssetID);
+                    }
+                    args["wearables"] = wears;
+                }
+
+                //System.Console.WriteLine("XXX Before packing Attachments");
+                Dictionary<int, UUID[]> attachments = Appearance.GetAttachmentDictionary();
+                if ((attachments != null) && (attachments.Count > 0))
+                {
+                    OSDArray attachs = new OSDArray(attachments.Count);
+                    foreach (KeyValuePair<int, UUID[]> kvp in attachments)
+                    {
+                        AttachmentData adata = new AttachmentData(kvp.Key, kvp.Value[0], kvp.Value[1]);
+                        attachs.Add(adata.PackUpdateMessage());
+                        //System.Console.WriteLine("XXX att.pt=" + kvp.Key + "; itemID=" + kvp.Value[0] + "; assetID=" + kvp.Value[1]);
+                    }
+                    args["attachments"] = attachs;
+                }
+            }
+
+            if (ServiceURLs != null && ServiceURLs.Count > 0)
+            {
+                OSDArray urls = new OSDArray(ServiceURLs.Count * 2);
+                foreach (KeyValuePair<string, object> kvp in ServiceURLs)
+                {
+                    //System.Console.WriteLine("XXX " + kvp.Key + "=" + kvp.Value);
+                    urls.Add(OSD.FromString(kvp.Key));
+                    urls.Add(OSD.FromString((kvp.Value == null) ? string.Empty : kvp.Value.ToString()));
+                }
+                args["service_urls"] = urls;
+            }
 
             return args;
         }
@@ -193,6 +253,8 @@ namespace OpenSim.Framework
                     }
                 }
             }
+            else
+                ChildrenCapSeeds = new Dictionary<ulong, string>();
 
             if (args["child"] != null)
                 child = args["child"].AsBoolean();
@@ -208,10 +270,51 @@ namespace OpenSim.Framework
                 SecureSessionID = args["secure_session_id"].AsUUID();
             if (args["session_id"] != null)
                 SessionID = args["session_id"].AsUUID();
+            if (args["service_session_id"] != null)
+                ServiceSessionID = args["service_session_id"].AsString();
+
             if (args["start_pos"] != null)
-                Vector3.TryParse(args["start_pos"].AsString(), out startpos); 
+                Vector3.TryParse(args["start_pos"].AsString(), out startpos);
+
+            Appearance = new AvatarAppearance(AgentID);
+            if (args["appearance_serial"] != null)
+                Appearance.Serial = args["appearance_serial"].AsInteger();
+            if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
+            {
+                OSDArray wears = (OSDArray)(args["wearables"]);
+                for (int i = 0; i < wears.Count / 2; i++) 
+                {
+                    Appearance.Wearables[i].ItemID = wears[i*2].AsUUID();
+                    Appearance.Wearables[i].AssetID = wears[(i*2)+1].AsUUID();
+                }
+           }
+
+            if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array)
+            {
+                OSDArray attachs = (OSDArray)(args["attachments"]);
+                AttachmentData[] attachments = new AttachmentData[attachs.Count];
+                int i = 0;
+                foreach (OSD o in attachs)
+                {
+                    if (o.Type == OSDType.Map)
+                    {
+                        attachments[i++] = new AttachmentData((OSDMap)o);
+                    }
+                }
+                Appearance.SetAttachments(attachments);
+            }
 
+            ServiceURLs = new Dictionary<string, object>();
+            if (args.ContainsKey("service_urls") && args["service_urls"] != null && (args["service_urls"]).Type == OSDType.Array)
+            {
+                OSDArray urls = (OSDArray)(args["service_urls"]);
+                for (int i = 0; i < urls.Count / 2; i++)
+                {
+                    ServiceURLs[urls[i * 2].AsString()] = urls[(i * 2) + 1].AsString();
+                    //System.Console.WriteLine("XXX " + urls[i * 2].AsString() + "=" + urls[(i * 2) + 1].AsString());
 
+                }
+            }
         }
     }