diff options
author | Melanie | 2012-10-17 20:46:38 +0200 |
---|---|---|
committer | Melanie | 2012-10-17 20:46:38 +0200 |
commit | 0ca96669321b1a33190d0d93ae8f7b3aee60f492 (patch) | |
tree | ac3b6297630f461f468a13550eaabe571f993ac6 /OpenSim/Region/Physics/Manager/PhysicsActor.cs | |
parent | Allow the console to be used by gods as well as region owners. (diff) | |
parent | coment a debug warning (diff) | |
download | opensim-SC_OLD-0ca96669321b1a33190d0d93ae8f7b3aee60f492.zip opensim-SC_OLD-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.gz opensim-SC_OLD-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.bz2 opensim-SC_OLD-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.xz |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index a2c72c3..14f65b8 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -315,6 +315,23 @@ namespace OpenSim.Region.Physics.Manager | |||
315 | } | 315 | } |
316 | } | 316 | } |
317 | 317 | ||
318 | |||
319 | public virtual float PhysicsCost | ||
320 | { | ||
321 | get | ||
322 | { | ||
323 | return 0.1f; | ||
324 | } | ||
325 | } | ||
326 | |||
327 | public virtual float StreamCost | ||
328 | { | ||
329 | get | ||
330 | { | ||
331 | return 1.0f; | ||
332 | } | ||
333 | } | ||
334 | |||
318 | /// <summary> | 335 | /// <summary> |
319 | /// Velocity of this actor. | 336 | /// Velocity of this actor. |
320 | /// </summary> | 337 | /// </summary> |