diff options
author | Dan Lake | 2011-07-20 14:34:02 -0700 |
---|---|---|
committer | Dan Lake | 2011-07-20 14:34:02 -0700 |
commit | 3270bd560e29fcc871cab6e99a504903eef7af0e (patch) | |
tree | 2804de3b653aa704f707dfea08d6ef55b23ffa09 /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | Apply the localID to the Physics actor to prevent null calls later (diff) | |
download | opensim-SC-3270bd560e29fcc871cab6e99a504903eef7af0e.zip opensim-SC-3270bd560e29fcc871cab6e99a504903eef7af0e.tar.gz opensim-SC-3270bd560e29fcc871cab6e99a504903eef7af0e.tar.bz2 opensim-SC-3270bd560e29fcc871cab6e99a504903eef7af0e.tar.xz |
Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 28ace34..3870411 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -88,23 +88,9 @@ namespace OpenSim.Region.Physics.Manager | |||
88 | 88 | ||
89 | public abstract void RemovePrim(PhysicsActor prim); | 89 | public abstract void RemovePrim(PhysicsActor prim); |
90 | 90 | ||
91 | //public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
92 | // Vector3 size, Quaternion rotation); //To be removed - Actually removed! | ||
93 | |||
94 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 91 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
95 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); | 92 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); |
96 | 93 | ||
97 | public virtual PhysicsActor AddPrimShape(uint localID, string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
98 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid) | ||
99 | { | ||
100 | PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); | ||
101 | |||
102 | if (ret != null) | ||
103 | ret.LocalID = localID; | ||
104 | |||
105 | return ret; | ||
106 | } | ||
107 | |||
108 | public virtual float TimeDilation | 94 | public virtual float TimeDilation |
109 | { | 95 | { |
110 | get { return 1.0f; } | 96 | get { return 1.0f; } |