diff options
author | UbitUmarov | 2012-03-11 06:32:06 +0000 |
---|---|---|
committer | UbitUmarov | 2012-03-11 06:32:06 +0000 |
commit | 21a76a619f62e76f366d8bfa1f37f776cfb92fa3 (patch) | |
tree | e8ec6257f3ec47232ac6d25c87202ce5745e55ee /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
download | opensim-SC-21a76a619f62e76f366d8bfa1f37f776cfb92fa3.zip opensim-SC-21a76a619f62e76f366d8bfa1f37f776cfb92fa3.tar.gz opensim-SC-21a76a619f62e76f366d8bfa1f37f776cfb92fa3.tar.bz2 opensim-SC-21a76a619f62e76f366d8bfa1f37f776cfb92fa3.tar.xz |
initial steps to support physical phantoms
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 0346d4e..eca6a0f 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -122,9 +122,6 @@ namespace OpenSim.Region.Physics.Manager | |||
122 | /// <param name="prim"></param> | 122 | /// <param name="prim"></param> |
123 | public abstract void RemovePrim(PhysicsActor prim); | 123 | public abstract void RemovePrim(PhysicsActor prim); |
124 | 124 | ||
125 | //public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
126 | // Vector3 size, Quaternion rotation); //To be removed - Actually removed! | ||
127 | |||
128 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 125 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
129 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); | 126 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); |
130 | 127 | ||
@@ -134,6 +131,12 @@ namespace OpenSim.Region.Physics.Manager | |||
134 | return null; | 131 | return null; |
135 | } | 132 | } |
136 | 133 | ||
134 | public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
135 | Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, uint localid) | ||
136 | { | ||
137 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); | ||
138 | } | ||
139 | |||
137 | public virtual float TimeDilation | 140 | public virtual float TimeDilation |
138 | { | 141 | { |
139 | get { return 1.0f; } | 142 | get { return 1.0f; } |