aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-18 00:38:29 +0100
committerJustin Clark-Casey (justincc)2012-05-18 00:38:29 +0100
commit6501b1b1bb297eb5ed8a44447f771c7b73b0e905 (patch)
tree201d68d7835178897aa2f52d3d1edd64324fd14a /OpenSim/Region/Physics
parentDon't eagerly clear frame collision events when physics actors subscribe and ... (diff)
downloadopensim-SC_OLD-6501b1b1bb297eb5ed8a44447f771c7b73b0e905.zip
opensim-SC_OLD-6501b1b1bb297eb5ed8a44447f771c7b73b0e905.tar.gz
opensim-SC_OLD-6501b1b1bb297eb5ed8a44447f771c7b73b0e905.tar.bz2
opensim-SC_OLD-6501b1b1bb297eb5ed8a44447f771c7b73b0e905.tar.xz
refactor: move EventQueueGet path generation into common method. Rename some local variables in line with code conventions. Add commented out EQG log lines for future use.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 1b1c44a..54b69a2 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1274,7 +1274,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1274 1274
1275 // Don't clear collision event reporting here. This is called directly from scene code and so can lead 1275 // Don't clear collision event reporting here. This is called directly from scene code and so can lead
1276 // to a race condition with the simulate loop 1276 // to a race condition with the simulate loop
1277 1277
1278 m_requestedUpdateFrequency = 0; 1278 m_requestedUpdateFrequency = 0;
1279 m_eventsubscription = 0; 1279 m_eventsubscription = 0;
1280 } 1280 }