aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorTeravus Ovares2009-02-08 17:25:02 +0000
committerTeravus Ovares2009-02-08 17:25:02 +0000
commit26ca3e26bf10cec2d374b0f0a79c4c255275b28e (patch)
treecf2183bdaf3da4594b6547e236d17c857e882f55 /OpenSim/Region/Physics/Manager
parentsend group name in binary bucket in chatterbox invitation eventqueue message (diff)
downloadopensim-SC-26ca3e26bf10cec2d374b0f0a79c4c255275b28e.zip
opensim-SC-26ca3e26bf10cec2d374b0f0a79c4c255275b28e.tar.gz
opensim-SC-26ca3e26bf10cec2d374b0f0a79c4c255275b28e.tar.bz2
opensim-SC-26ca3e26bf10cec2d374b0f0a79c4c255275b28e.tar.xz
Reverts patch from tuco/mikkopa/sempuki mantis #3072
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs3
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs6
2 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 94f3d85..0f75c46 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -213,9 +213,6 @@ 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) { }
219 } 216 }
220 217
221 public class NullPhysicsActor : PhysicsActor 218 public class NullPhysicsActor : PhysicsActor
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 3d0015f..2cf4d5a 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -152,12 +152,6 @@ 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
161 private class NullPhysicsScene : PhysicsScene 155 private class NullPhysicsScene : PhysicsScene
162 { 156 {
163 private static int m_workIndicator; 157 private static int m_workIndicator;