From 9f9693dab825c7753af49c6838a484653047d4ae Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 3 May 2012 01:18:51 +0200
Subject: Clear permissions given to the object we stand up from

---
 OpenSim/Framework/ChildAgentDataUpdate.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index fe12874..abff44a 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -229,12 +229,14 @@ namespace OpenSim.Framework
 
     public class ControllerData
     {
+        public UUID ObjectID;
         public UUID ItemID;
         public uint IgnoreControls;
         public uint EventControls;
 
-        public ControllerData(UUID item, uint ignore, uint ev)
+        public ControllerData(UUID obj, UUID item, uint ignore, uint ev)
         {
+            ObjectID = obj;
             ItemID = item;
             IgnoreControls = ignore;
             EventControls = ev;
@@ -248,6 +250,7 @@ namespace OpenSim.Framework
         public OSDMap PackUpdateMessage()
         {
             OSDMap controldata = new OSDMap();
+            controldata["object"] = OSD.FromUUID(ObjectID);
             controldata["item"] = OSD.FromUUID(ItemID);
             controldata["ignore"] = OSD.FromInteger(IgnoreControls);
             controldata["event"] = OSD.FromInteger(EventControls);
@@ -258,6 +261,8 @@ namespace OpenSim.Framework
 
         public void UnpackUpdateMessage(OSDMap args)
         {
+            if (args["object"] != null)
+                ObjectID = args["object"].AsUUID();
             if (args["item"] != null)
                 ItemID = args["item"].AsUUID();
             if (args["ignore"] != null)
-- 
cgit v1.1


From 333d013b5c34d7ed8c016251e50b80b62500aa3f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 4 May 2012 20:33:48 +0200
Subject: Add the default animation to the child agent data update

---
 OpenSim/Framework/ChildAgentDataUpdate.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index abff44a..7962ff4 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -311,6 +311,7 @@ namespace OpenSim.Framework
 
         public AgentGroupData[] Groups;
         public Animation[] Anims;
+        public Animation DefaultAnim = null;
 
         public UUID GranterID;
         public UUID ParentPart;
@@ -397,6 +398,11 @@ namespace OpenSim.Framework
                 args["animations"] = anims;
             }
 
+            if (DefaultAnim != null)
+            {
+                args["default_animation"] = DefaultAnim.PackUpdateMessage();
+            }
+
             if (Appearance != null)
                 args["packed_appearance"] = Appearance.Pack();
 
@@ -594,6 +600,11 @@ namespace OpenSim.Framework
                 }
             }
 
+            if (args["default_animation"] != null)
+            {
+                DefaultAnim = new Animation((OSDMap)args["default_animation"]);
+            }
+
             //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
             //{
             //    OSDArray textures = (OSDArray)(args["agent_textures"]);
-- 
cgit v1.1


From 197163e12a265af66a9393bc6753c7a50520c5b1 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 4 May 2012 21:00:41 +0200
Subject: Fix teleporting from older to newer regions

---
 OpenSim/Framework/ChildAgentDataUpdate.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 7962ff4..e718aa6 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -602,7 +602,14 @@ namespace OpenSim.Framework
 
             if (args["default_animation"] != null)
             {
-                DefaultAnim = new Animation((OSDMap)args["default_animation"]);
+                try
+                {
+                    DefaultAnim = new Animation((OSDMap)args["default_animation"]);
+                }
+                catch
+                {
+                    DefaultAnim = null;
+                }
             }
 
             //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
-- 
cgit v1.1