Merge branch 'avination' of careminster:/var/git/careminster into teravuswork

1 files changed, 17 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 5af6373..9338130 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Region.Physics.Manager
         public Vector3 SurfaceNormal;
         public float PenetrationDepth;
         public float RelativeSpeed;
+        public bool CharacterFeet;
 
         public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth)
         {
@@ -68,6 +69,16 @@ namespace OpenSim.Region.Physics.Manager
             SurfaceNormal = surfaceNormal;
             PenetrationDepth = penetrationDepth;
             RelativeSpeed = 0f; // for now let this one be set explicity
+            CharacterFeet = true;  // keep other plugins work as before
+        }
+
+        public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth, bool feet)
+        {
+            Position = position;
+            SurfaceNormal = surfaceNormal;
+            PenetrationDepth = penetrationDepth;
+            RelativeSpeed = 0f; // for now let this one be set explicity
+            CharacterFeet = feet;  // keep other plugins work as before
         }
     }
 
@@ -173,6 +184,11 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract Vector3 Size { get; set; }
 
+        public virtual void setAvatarSize(Vector3 size, float feetOffset)
+        {
+            Size = size;
+        }
+
         public virtual bool Phantom { get; set; }
 
         public virtual bool IsVolumeDtc
@@ -395,6 +411,7 @@ namespace OpenSim.Region.Physics.Manager
         // Warning in a parent part it returns itself, not null
         public virtual PhysicsActor ParentActor { get { return this; } }
         
+
     }
 
     public class NullPhysicsActor : PhysicsActor