aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-21 03:10:28 +0100
committerJustin Clark-Casey (justincc)2011-07-21 03:10:28 +0100
commit703d130e965339a2432ff9619721f02206be7d24 (patch)
treefb5d58135d6e7af00d773b7dd54d4e26586523c7 /OpenSim/Region/Physics/Manager/PhysicsScene.cs
parentmake default TextureOnMapTile true for the older map imager (diff)
parentRemoved unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff)
downloadopensim-SC_OLD-703d130e965339a2432ff9619721f02206be7d24.zip
opensim-SC_OLD-703d130e965339a2432ff9619721f02206be7d24.tar.gz
opensim-SC_OLD-703d130e965339a2432ff9619721f02206be7d24.tar.bz2
opensim-SC_OLD-703d130e965339a2432ff9619721f02206be7d24.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs14
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; }