diff options
author | Teravus Ovares | 2007-11-10 19:13:52 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-10 19:13:52 +0000 |
commit | cb07ba0d68eeb57bae1cb60f387483ff720cc29d (patch) | |
tree | a46f7b6b50e70a9f5f56a89396ba8a3f1078c19e /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | * ODE Fixed annoying bug where resizing causes there to be a 'ghost' prim lef... (diff) | |
download | opensim-SC-cb07ba0d68eeb57bae1cb60f387483ff720cc29d.zip opensim-SC-cb07ba0d68eeb57bae1cb60f387483ff720cc29d.tar.gz opensim-SC-cb07ba0d68eeb57bae1cb60f387483ff720cc29d.tar.bz2 opensim-SC-cb07ba0d68eeb57bae1cb60f387483ff720cc29d.tar.xz |
* Moves the Meshmerizer to a separate plugin
* Experimental. Linux Prebuild needs testing.
* One more update after this to remove the ODEMeshing directory....
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 13591ea..6f19e72 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using Axiom.Math; | 28 | using Axiom.Math; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenSim.Framework.Console; | 30 | using OpenSim.Framework.Console; |
31 | using OpenSim.Region.Physics.Manager; | ||
31 | 32 | ||
32 | namespace OpenSim.Region.Physics.Manager | 33 | namespace OpenSim.Region.Physics.Manager |
33 | { | 34 | { |
@@ -38,6 +39,8 @@ namespace OpenSim.Region.Physics.Manager | |||
38 | get { return new NullPhysicsScene(); } | 39 | get { return new NullPhysicsScene(); } |
39 | } | 40 | } |
40 | 41 | ||
42 | public abstract void Initialise(IMesher meshmerizer); | ||
43 | |||
41 | public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position); | 44 | public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position); |
42 | 45 | ||
43 | public abstract void RemoveAvatar(PhysicsActor actor); | 46 | public abstract void RemoveAvatar(PhysicsActor actor); |
@@ -63,6 +66,12 @@ namespace OpenSim.Region.Physics.Manager | |||
63 | { | 66 | { |
64 | private static int m_workIndicator; | 67 | private static int m_workIndicator; |
65 | 68 | ||
69 | |||
70 | public override void Initialise(IMesher meshmerizer) | ||
71 | { | ||
72 | // Does nothing right now | ||
73 | } | ||
74 | |||
66 | public override PhysicsActor AddAvatar(string avName, PhysicsVector position) | 75 | public override PhysicsActor AddAvatar(string avName, PhysicsVector position) |
67 | { | 76 | { |
68 | MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); | 77 | MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); |
@@ -123,4 +132,4 @@ namespace OpenSim.Region.Physics.Manager | |||
123 | } | 132 | } |
124 | } | 133 | } |
125 | } | 134 | } |
126 | } \ No newline at end of file | 135 | } |