2 files changed, 19 insertions, 1 deletions

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index e718aa6..8c32734 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -312,6 +312,7 @@ namespace OpenSim.Framework
         public AgentGroupData[] Groups;
         public Animation[] Anims;
         public Animation DefaultAnim = null;
+        public Animation AnimState = null;
 
         public UUID GranterID;
         public UUID ParentPart;
@@ -403,6 +404,11 @@ namespace OpenSim.Framework
                 args["default_animation"] = DefaultAnim.PackUpdateMessage();
             }
 
+            if (AnimState != null)
+            {
+                args["animation_state"] = AnimState.PackUpdateMessage();
+            }
+
             if (Appearance != null)
                 args["packed_appearance"] = Appearance.Pack();
 
@@ -612,6 +618,18 @@ namespace OpenSim.Framework
                 }
             }
 
+            if (args["animation_state"] != null)
+            {
+                try
+                {
+                    AnimState = new Animation((OSDMap)args["animation_state"]);
+                }
+                catch
+                {
+                    AnimState = null;
+                }
+            }
+
             //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
             //{
             //    OSDArray textures = (OSDArray)(args["agent_textures"]);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 49b771f..165dd85 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -813,7 +813,7 @@ namespace OpenSim.Region.Framework.Scenes
                         actor.Orientation = GetWorldRotation();
 
                         // Tell the physics engines that this prim changed.
-                        if (ParentGroup.Scene != null)
+                        if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null)
                             ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
                     }