From 9d1a6558d9e65ab70703cea15b3752c33c4ee244 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 17 Dec 2012 01:43:16 +0000
Subject: *TESTP unscripted sit: missing files
---
OpenSim/Region/Physics/Manager/PhysicsActor.cs | 1 +
OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index e39cee7..9338130 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -411,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
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index cdffa6b..a442cf0 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -38,6 +38,7 @@ namespace OpenSim.Region.Physics.Manager
public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal);
public delegate void RayCallback(List<ContactResult> list);
+ public delegate void SitAvatarCallback(int status, uint partID, Vector3 offset, Quaternion Orientation);
public delegate void JointMoved(PhysicsJoint joint);
public delegate void JointDeactivated(PhysicsJoint joint);
@@ -357,5 +358,9 @@ namespace OpenSim.Region.Physics.Manager
return new List<ContactResult>();
}
+ public virtual int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse)
+ {
+ return 0;
+ }
}
}
--
cgit v1.1