aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff options
context:
space:
mode:
authorMelanie2013-02-07 23:22:00 +0000
committerMelanie2013-02-07 23:22:00 +0000
commit22675e6b14ce1b180f517c1ab92627d283192032 (patch)
tree4cf256430dc062f399c7ace49de3548477e00115 /OpenSim/Region/Physics/Manager/PhysicsScene.cs
parentPlumb the path from the client to the extra physics params and back (diff)
downloadopensim-SC_OLD-22675e6b14ce1b180f517c1ab92627d283192032.zip
opensim-SC_OLD-22675e6b14ce1b180f517c1ab92627d283192032.tar.gz
opensim-SC_OLD-22675e6b14ce1b180f517c1ab92627d283192032.tar.bz2
opensim-SC_OLD-22675e6b14ce1b180f517c1ab92627d283192032.tar.xz
Add some more code from Avination. This changes physics actor stuff around
to work with the new params. Not actually plumbed just yet.
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index c4d7ef3..290b72e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -166,6 +166,12 @@ namespace OpenSim.Region.Physics.Manager
166 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 166 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
167 Vector3 size, Quaternion rotation, bool isPhysical, uint localid); 167 Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
168 168
169 public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
170 Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid)
171 {
172 return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
173 }
174
169 public virtual float TimeDilation 175 public virtual float TimeDilation
170 { 176 {
171 get { return 1.0f; } 177 get { return 1.0f; }