Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 0d053e4..5a9eeb5 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
         public bool child;
 
         /// <summary>
-        /// Number given to the client when they log-in that they provide 
+        /// Number given to the client when they log-in that they provide
         /// as credentials to the UDP server
         /// </summary>
         public uint circuitcode;
@@ -184,7 +184,7 @@ namespace OpenSim.Framework
         /// Pack AgentCircuitData into an OSDMap for transmission over LLSD XML or LLSD json
         /// </summary>
         /// <returns>map of the agent circuit data</returns>
-        public OSDMap PackAgentCircuitData()
+        public OSDMap PackAgentCircuitData(EntityTransferContext ctx)
         {
             OSDMap args = new OSDMap();
             args["agent_id"] = OSD.FromUUID(AgentID);
@@ -224,7 +224,7 @@ namespace OpenSim.Framework
             {
                 args["appearance_serial"] = OSD.FromInteger(Appearance.Serial);
 
-                OSDMap appmap = Appearance.Pack();
+                OSDMap appmap = Appearance.Pack(ctx);
                 args["packed_appearance"] = appmap;
             }
 
@@ -328,7 +328,7 @@ namespace OpenSim.Framework
                 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
 
             //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
-            
+
             try
             {
                 // Unpack various appearance elements
@@ -353,7 +353,7 @@ namespace OpenSim.Framework
             {
                 m_log.ErrorFormat("[AGENTCIRCUITDATA] failed to unpack appearance; {0}",e.Message);
             }
-            
+
             ServiceURLs = new Dictionary<string, object>();
             // Try parse the new way, OSDMap
             if (args.ContainsKey("serviceurls") && args["serviceurls"] != null && (args["serviceurls"]).Type == OSDType.Map)