diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 22 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsSensor.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/ZeroMesher.cs | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index c1dc91b..3cf2646 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Physics.Manager | |||
140 | // a race condition if the last subscriber unsubscribes | 140 | // a race condition if the last subscriber unsubscribes |
141 | // immediately after the null check and before the event is raised. | 141 | // immediately after the null check and before the event is raised. |
142 | RequestTerseUpdate handler = OnRequestTerseUpdate; | 142 | RequestTerseUpdate handler = OnRequestTerseUpdate; |
143 | 143 | ||
144 | if (handler != null) | 144 | if (handler != null) |
145 | { | 145 | { |
146 | handler(); | 146 | handler(); |
@@ -163,9 +163,9 @@ namespace OpenSim.Region.Physics.Manager | |||
163 | public virtual void SendCollisionUpdate(EventArgs e) | 163 | public virtual void SendCollisionUpdate(EventArgs e) |
164 | { | 164 | { |
165 | CollisionUpdate handler = OnCollisionUpdate; | 165 | CollisionUpdate handler = OnCollisionUpdate; |
166 | 166 | ||
167 | if (handler != null) | 167 | if (handler != null) |
168 | { | 168 | { |
169 | handler(e); | 169 | handler(e); |
170 | } | 170 | } |
171 | } | 171 | } |
@@ -205,9 +205,9 @@ namespace OpenSim.Region.Physics.Manager | |||
205 | 205 | ||
206 | public class NullPhysicsActor : PhysicsActor | 206 | public class NullPhysicsActor : PhysicsActor |
207 | { | 207 | { |
208 | public override bool Stopped | 208 | public override bool Stopped |
209 | { | 209 | { |
210 | get{ return false; } | 210 | get{ return false; } |
211 | } | 211 | } |
212 | 212 | ||
213 | public override PhysicsVector Position | 213 | public override PhysicsVector Position |
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Physics.Manager | |||
222 | set { return; } | 222 | set { return; } |
223 | } | 223 | } |
224 | 224 | ||
225 | public override uint LocalID | 225 | public override uint LocalID |
226 | { | 226 | { |
227 | set { return; } | 227 | set { return; } |
228 | } | 228 | } |
@@ -240,14 +240,14 @@ namespace OpenSim.Region.Physics.Manager | |||
240 | public override float Buoyancy | 240 | public override float Buoyancy |
241 | { | 241 | { |
242 | get { return 0f; } | 242 | get { return 0f; } |
243 | set { return; } | 243 | set { return; } |
244 | } | 244 | } |
245 | 245 | ||
246 | public override bool FloatOnWater | 246 | public override bool FloatOnWater |
247 | { | 247 | { |
248 | set { return; } | 248 | set { return; } |
249 | } | 249 | } |
250 | 250 | ||
251 | public override bool CollidingGround | 251 | public override bool CollidingGround |
252 | { | 252 | { |
253 | get { return false; } | 253 | get { return false; } |
@@ -297,7 +297,7 @@ namespace OpenSim.Region.Physics.Manager | |||
297 | set { return; } | 297 | set { return; } |
298 | } | 298 | } |
299 | 299 | ||
300 | public override float CollisionScore | 300 | public override float CollisionScore |
301 | { | 301 | { |
302 | get { return 0f; } | 302 | get { return 0f; } |
303 | } | 303 | } |
@@ -385,7 +385,7 @@ namespace OpenSim.Region.Physics.Manager | |||
385 | 385 | ||
386 | public override void SubscribeEvents(int ms) | 386 | public override void SubscribeEvents(int ms) |
387 | { | 387 | { |
388 | 388 | ||
389 | } | 389 | } |
390 | public override void UnSubscribeEvents() | 390 | public override void UnSubscribeEvents() |
391 | { | 391 | { |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index b8ca180..6a71581 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Physics.Manager | |||
94 | _MeshPlugins.Add(plugHard.GetName(), plugHard); | 94 | _MeshPlugins.Add(plugHard.GetName(), plugHard); |
95 | m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); | 95 | m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName()); |
96 | 96 | ||
97 | // And now walk all assemblies (DLLs effectively) and see if they are home | 97 | // And now walk all assemblies (DLLs effectively) and see if they are home |
98 | // of a plugin that is of interest for us | 98 | // of a plugin that is of interest for us |
99 | string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics"); | 99 | string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics"); |
100 | string[] pluginFiles = Directory.GetFiles(path, "*.dll"); | 100 | string[] pluginFiles = Directory.GetFiles(path, "*.dll"); |
@@ -108,11 +108,11 @@ namespace OpenSim.Region.Physics.Manager | |||
108 | private void AddPlugin(string FileName) | 108 | private void AddPlugin(string FileName) |
109 | { | 109 | { |
110 | // TODO / NOTE | 110 | // TODO / NOTE |
111 | // The assembly named 'OpenSim.Region.Physics.BasicPhysicsPlugin' was loaded from | 111 | // The assembly named 'OpenSim.Region.Physics.BasicPhysicsPlugin' was loaded from |
112 | // 'file:///C:/OpenSim/trunk2/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll' | 112 | // 'file:///C:/OpenSim/trunk2/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll' |
113 | // using the LoadFrom context. The use of this context can result in unexpected behavior | 113 | // using the LoadFrom context. The use of this context can result in unexpected behavior |
114 | // for serialization, casting and dependency resolution. In almost all cases, it is recommended | 114 | // for serialization, casting and dependency resolution. In almost all cases, it is recommended |
115 | // that the LoadFrom context be avoided. This can be done by installing assemblies in the | 115 | // that the LoadFrom context be avoided. This can be done by installing assemblies in the |
116 | // Global Assembly Cache or in the ApplicationBase directory and using Assembly. | 116 | // Global Assembly Cache or in the ApplicationBase directory and using Assembly. |
117 | // Load when explicitly loading assemblies. | 117 | // Load when explicitly loading assemblies. |
118 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | 118 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsSensor.cs b/OpenSim/Region/Physics/Manager/PhysicsSensor.cs index ce53108..add741b 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsSensor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsSensor.cs | |||
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Physics.Manager | |||
35 | { | 35 | { |
36 | NONE = 0, | 36 | NONE = 0, |
37 | AGENT = 1, | 37 | AGENT = 1, |
38 | ACTIVE = 2, | 38 | ACTIVE = 2, |
39 | PASSIVE = 3, | 39 | PASSIVE = 3, |
40 | SCRIPTED = 4 | 40 | SCRIPTED = 4 |
41 | } | 41 | } |
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs index b98cb35..b759213 100644 --- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs +++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs | |||
@@ -31,9 +31,9 @@ using OpenSim.Framework; | |||
31 | /* | 31 | /* |
32 | * This is the zero mesher. | 32 | * This is the zero mesher. |
33 | * Whatever you want him to mesh, he can't, telling you that by responding with a null pointer. | 33 | * Whatever you want him to mesh, he can't, telling you that by responding with a null pointer. |
34 | * Effectivly this is for switching off meshing and for testing as each physics machine should deal | 34 | * Effectivly this is for switching off meshing and for testing as each physics machine should deal |
35 | * with the null pointer situation. | 35 | * with the null pointer situation. |
36 | * But it's also a convenience thing, as physics machines can rely on having a mesher in any situation, even | 36 | * But it's also a convenience thing, as physics machines can rely on having a mesher in any situation, even |
37 | * if it's a dump one like this. | 37 | * if it's a dump one like this. |
38 | * Note, that this mesher is *not* living in a module but in the manager itself, so | 38 | * Note, that this mesher is *not* living in a module but in the manager itself, so |
39 | * it's always availabe and thus the default in case of configuration errors | 39 | * it's always availabe and thus the default in case of configuration errors |