aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorroot2011-07-21 21:12:50 +0100
committerroot2011-07-21 21:12:50 +0100
commitd8228f4374de8ab4274a54aae75c371cff6c4551 (patch)
tree0af2bdcb0c1c105b5be367f4287cc0238067dbba /OpenSim
parentWhen an uncached asset is requested multiple times concurrently, only load it... (diff)
parentremove the windows debugging symbols for the long protobuf-net (diff)
downloadopensim-SC_OLD-d8228f4374de8ab4274a54aae75c371cff6c4551.zip
opensim-SC_OLD-d8228f4374de8ab4274a54aae75c371cff6c4551.tar.gz
opensim-SC_OLD-d8228f4374de8ab4274a54aae75c371cff6c4551.tar.bz2
opensim-SC_OLD-d8228f4374de8ab4274a54aae75c371cff6c4551.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
-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; }