aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-13 23:14:41 +0000
committerTeravus Ovares2008-02-13 23:14:41 +0000
commit3588d89b2cba36415991c46c300b1f9c94f109bf (patch)
tree985987f9e0a2e60815134f05a4d69c658aef4ed4 /OpenSim/Region/Physics/Manager
parent* Fixed another bug in avatarpicker ('surname'/'lastname' mixup) (diff)
downloadopensim-SC_OLD-3588d89b2cba36415991c46c300b1f9c94f109bf.zip
opensim-SC_OLD-3588d89b2cba36415991c46c300b1f9c94f109bf.tar.gz
opensim-SC_OLD-3588d89b2cba36415991c46c300b1f9c94f109bf.tar.bz2
opensim-SC_OLD-3588d89b2cba36415991c46c300b1f9c94f109bf.tar.xz
* Bigish ODE stability Update. Run Prebuild
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/CollisionLocker.cs46
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs7
2 files changed, 53 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/CollisionLocker.cs b/OpenSim/Region/Physics/Manager/CollisionLocker.cs
new file mode 100644
index 0000000..7a11720
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/CollisionLocker.cs
@@ -0,0 +1,46 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Region.Physics.Manager
6{
7 public class CollisionLocker
8 {
9
10 private bool locked = false;
11 private List<IntPtr> worldlock = new List<IntPtr>();
12 public CollisionLocker()
13 {
14
15 }
16 public void dlock(IntPtr world)
17 {
18 lock (worldlock)
19 {
20 worldlock.Add(world);
21 }
22
23 }
24 public void dunlock(IntPtr world)
25 {
26 lock (worldlock)
27 {
28 worldlock.Remove(world);
29 }
30 }
31 public bool lockquery()
32 {
33 return (worldlock.Count > 0);
34 }
35 public void drelease(IntPtr world)
36 {
37 lock (worldlock)
38 {
39 if (worldlock.Contains(world))
40 worldlock.Remove(world);
41 }
42 }
43
44 }
45
46}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 7741687..97eccba 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -126,6 +126,8 @@ namespace OpenSim.Region.Physics.Manager
126 126
127 public abstract bool Selected { set; } 127 public abstract bool Selected { set; }
128 128
129 public abstract void CrossingFailure();
130
129 public virtual void RequestPhysicsterseUpdate() 131 public virtual void RequestPhysicsterseUpdate()
130 { 132 {
131 // Make a temporary copy of the event to avoid possibility of 133 // Make a temporary copy of the event to avoid possibility of
@@ -279,6 +281,11 @@ namespace OpenSim.Region.Physics.Manager
279 get { return 0f; } 281 get { return 0f; }
280 } 282 }
281 283
284 public override void CrossingFailure()
285 {
286
287 }
288
282 289
283 public override Quaternion Orientation 290 public override Quaternion Orientation
284 { 291 {