From 2d3381b795611a8857077d1effb41323c2cb8658 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 14 Feb 2012 23:16:20 +0100
Subject: Implement region crossing of sitting avatars. Edit mode and llSetPos
 work but unscripted default sit anim is lost. Still some Gfx glitching.
 Physical crossing doesn't work yet.

---
 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 6d048f4..fe12874 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -308,6 +308,8 @@ namespace OpenSim.Framework
         public Animation[] Anims;
 
         public UUID GranterID;
+        public UUID ParentPart;
+        public Vector3 SitOffset;
 
         // Appearance
         public AvatarAppearance Appearance;
@@ -468,6 +470,10 @@ namespace OpenSim.Framework
                 }
                 args["attach_objects"] = attObjs;
             }
+
+            args["parent_part"] = OSD.FromUUID(ParentPart);
+            args["sit_offset"] = OSD.FromString(SitOffset.ToString());
+
             return args;
         }
 
@@ -675,6 +681,11 @@ namespace OpenSim.Framework
                     }
                 }
             }
+
+            if (args["parent_part"] != null)
+                ParentPart = args["parent_part"].AsUUID();
+            if (args["sit_offset"] != null)
+                Vector3.TryParse(args["sit_offset"].AsString(), out SitOffset);
         }
 
         public AgentData()
-- 
cgit v1.1