aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-20 17:50:19 +0000
committerTeravus Ovares2008-02-20 17:50:19 +0000
commit07774473af9955312b9f659a69eb857427a0f924 (patch)
tree63412f4129ae0733b8bab332272302f65cb03ae7
parentllSetTimerEvent updated to use ticks instead of DateTime for internal timing. (diff)
downloadopensim-SC_OLD-07774473af9955312b9f659a69eb857427a0f924.zip
opensim-SC_OLD-07774473af9955312b9f659a69eb857427a0f924.tar.gz
opensim-SC_OLD-07774473af9955312b9f659a69eb857427a0f924.tar.bz2
opensim-SC_OLD-07774473af9955312b9f659a69eb857427a0f924.tar.xz
* Fixed a long standing race condition in physics events. Could this be the source of the null on multicast_void: error?
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index b96ce27..088d85a 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Region.Physics.Manager
138 RequestTerseUpdate handler = OnRequestTerseUpdate; 138 RequestTerseUpdate handler = OnRequestTerseUpdate;
139 if (handler != null) 139 if (handler != null)
140 { 140 {
141 OnRequestTerseUpdate(); 141 handler();
142 } 142 }
143 } 143 }
144 144
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Physics.Manager
150 OutOfBounds handler = OnOutOfBounds; 150 OutOfBounds handler = OnOutOfBounds;
151 if (handler != null) 151 if (handler != null)
152 { 152 {
153 OnOutOfBounds(pos); 153 handler(pos);
154 } 154 }
155 } 155 }
156 156
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Physics.Manager
159 CollisionUpdate handler = OnCollisionUpdate; 159 CollisionUpdate handler = OnCollisionUpdate;
160 if (handler != null) 160 if (handler != null)
161 { 161 {
162 OnCollisionUpdate(e); 162 handler(e);
163 } 163 }
164 } 164 }
165 165