diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 49f60f8..798a0a4 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -25,8 +25,10 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using log4net; | ||
28 | using System; | 29 | using System; |
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | ||
30 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
31 | using OpenMetaverse; | 33 | using OpenMetaverse; |
32 | 34 | ||
@@ -46,10 +48,10 @@ namespace OpenSim.Region.Physics.Manager | |||
46 | 48 | ||
47 | public enum PIDHoverType | 49 | public enum PIDHoverType |
48 | { | 50 | { |
49 | Ground | 51 | Ground, |
50 | , GroundAndWater | 52 | GroundAndWater, |
51 | , Water | 53 | Water, |
52 | , Absolute | 54 | Absolute |
53 | } | 55 | } |
54 | 56 | ||
55 | public struct ContactPoint | 57 | public struct ContactPoint |
@@ -114,6 +116,8 @@ namespace OpenSim.Region.Physics.Manager | |||
114 | 116 | ||
115 | public abstract class PhysicsActor | 117 | public abstract class PhysicsActor |
116 | { | 118 | { |
119 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
120 | |||
117 | public delegate void RequestTerseUpdate(); | 121 | public delegate void RequestTerseUpdate(); |
118 | public delegate void CollisionUpdate(EventArgs e); | 122 | public delegate void CollisionUpdate(EventArgs e); |
119 | public delegate void OutOfBounds(Vector3 pos); | 123 | public delegate void OutOfBounds(Vector3 pos); |
@@ -197,10 +201,10 @@ namespace OpenSim.Region.Physics.Manager | |||
197 | { | 201 | { |
198 | CollisionUpdate handler = OnCollisionUpdate; | 202 | CollisionUpdate handler = OnCollisionUpdate; |
199 | 203 | ||
204 | // m_log.DebugFormat("[PHYSICS ACTOR]: Sending collision for {0}", LocalID); | ||
205 | |||
200 | if (handler != null) | 206 | if (handler != null) |
201 | { | ||
202 | handler(e); | 207 | handler(e); |
203 | } | ||
204 | } | 208 | } |
205 | 209 | ||
206 | public virtual void SetMaterial (int material) | 210 | public virtual void SetMaterial (int material) |