aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-17 10:41:08 +0000
committerTeravus Ovares2008-02-17 10:41:08 +0000
commit19e0ada93af347cff93a3950f66abe245399f8b2 (patch)
tree7578573f583e3037e19fc2db471209ea172f0b1c /OpenSim/Region/Physics/Manager
parentThank you very much, ChrisDown for a patch to (diff)
downloadopensim-SC_OLD-19e0ada93af347cff93a3950f66abe245399f8b2.zip
opensim-SC_OLD-19e0ada93af347cff93a3950f66abe245399f8b2.tar.gz
opensim-SC_OLD-19e0ada93af347cff93a3950f66abe245399f8b2.tar.bz2
opensim-SC_OLD-19e0ada93af347cff93a3950f66abe245399f8b2.tar.xz
* Located and destroyed the weird velocity and rotation transfers. It turned out to be that the Static PhysicsVector.Zero was transferring velocities between all non fixed objects. Not so static after all :(. Finding it was cruel and unusual punishment from the CLR.
* Therefore, when you run through a pile of prim you won't see things rotate when they're not supposed to anymore. * Avatars don't float off either.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/CollisionLocker.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs7
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/CollisionLocker.cs b/OpenSim/Region/Physics/Manager/CollisionLocker.cs
index 8c2e702..98e9736 100644
--- a/OpenSim/Region/Physics/Manager/CollisionLocker.cs
+++ b/OpenSim/Region/Physics/Manager/CollisionLocker.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Physics.Manager
35 public class CollisionLocker 35 public class CollisionLocker
36 { 36 {
37 37
38 private bool locked = false; 38
39 private List<IntPtr> worldlock = new List<IntPtr>(); 39 private List<IntPtr> worldlock = new List<IntPtr>();
40 public CollisionLocker() 40 public CollisionLocker()
41 { 41 {
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 97eccba..b96ce27 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -118,6 +118,8 @@ namespace OpenSim.Region.Physics.Manager
118 get { return new NullPhysicsActor(); } 118 get { return new NullPhysicsActor(); }
119 } 119 }
120 120
121 public abstract bool Stopped { get; }
122
121 public abstract PhysicsVector Size { get; set; } 123 public abstract PhysicsVector Size { get; set; }
122 124
123 public abstract PrimitiveBaseShape Shape { set; } 125 public abstract PrimitiveBaseShape Shape { set; }
@@ -204,6 +206,11 @@ namespace OpenSim.Region.Physics.Manager
204 206
205 public class NullPhysicsActor : PhysicsActor 207 public class NullPhysicsActor : PhysicsActor
206 { 208 {
209 public override bool Stopped
210 {
211 get{ return false; }
212 }
213
207 public override PhysicsVector Position 214 public override PhysicsVector Position
208 { 215 {
209 get { return PhysicsVector.Zero; } 216 get { return PhysicsVector.Zero; }