diff options
author | Mike Mazur | 2009-02-03 08:31:08 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-03 08:31:08 +0000 |
commit | 949ae6136e24aee1cb8d06491fed75970cab38d2 (patch) | |
tree | 23d1f735e7997ab911b4de639cc5d5bca390477b /OpenSim/Region/Physics/Manager | |
parent | Embed OpenSim.Data.addin.xml as a resource into OpenSim.Data.dll. (diff) | |
download | opensim-SC-949ae6136e24aee1cb8d06491fed75970cab38d2.zip opensim-SC-949ae6136e24aee1cb8d06491fed75970cab38d2.tar.gz opensim-SC-949ae6136e24aee1cb8d06491fed75970cab38d2.tar.bz2 opensim-SC-949ae6136e24aee1cb8d06491fed75970cab38d2.tar.xz |
Change access levels from private to protected to facilitate
subclassing; also add new method signatures. Thanks tuco and mikkopa.
Fix Mantis #3072.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 0f75c46..94f3d85 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -213,6 +213,9 @@ namespace OpenSim.Region.Physics.Manager | |||
213 | public abstract void SubscribeEvents(int ms); | 213 | public abstract void SubscribeEvents(int ms); |
214 | public abstract void UnSubscribeEvents(); | 214 | public abstract void UnSubscribeEvents(); |
215 | public abstract bool SubscribedEvents(); | 215 | public abstract bool SubscribedEvents(); |
216 | |||
217 | public virtual void SetCollisionMesh(byte[] meshdata, string meshname, bool scalemesh) { } | ||
218 | public virtual void SetBoundsScaling(bool scalemesh) { } | ||
216 | } | 219 | } |
217 | 220 | ||
218 | public class NullPhysicsActor : PhysicsActor | 221 | public class NullPhysicsActor : PhysicsActor |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 2cf4d5a..3d0015f 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -152,6 +152,12 @@ namespace OpenSim.Region.Physics.Manager | |||
152 | 152 | ||
153 | public abstract bool IsThreaded { get; } | 153 | public abstract bool IsThreaded { get; } |
154 | 154 | ||
155 | public virtual uint Raycast(PhysicsVector pos, PhysicsVector dir, float rayLength, uint ignoreId) | ||
156 | { return 0; } | ||
157 | |||
158 | public virtual void SetMaxFlightHeight(float maxheight) { } | ||
159 | |||
160 | |||
155 | private class NullPhysicsScene : PhysicsScene | 161 | private class NullPhysicsScene : PhysicsScene |
156 | { | 162 | { |
157 | private static int m_workIndicator; | 163 | private static int m_workIndicator; |