diff options
| author | Michael Cortez | 2009-08-06 09:38:51 -0700 |
|---|---|---|
| committer | Michael Cortez | 2009-08-06 09:38:51 -0700 |
| commit | 2ac04cb624d36c048b6793f9db7c073eb6a01026 (patch) | |
| tree | cb76f55c634c9f1107dea7204729497c5ba3bb75 /OpenSim/Region/Physics | |
| parent | Fixing comments re: INI file. (diff) | |
| parent | Add the config-include statement to OpenSim.ini.example. (diff) | |
| download | opensim-SC-2ac04cb624d36c048b6793f9db7c073eb6a01026.zip opensim-SC-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.gz opensim-SC-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.bz2 opensim-SC-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.xz | |
Merge branch 'master' into groups-core-contrib
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 83db396..9805ff5 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -2863,7 +2863,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2863 | //if ((framecount % m_randomizeWater) == 0) | 2863 | //if ((framecount % m_randomizeWater) == 0) |
| 2864 | // randomizeWater(waterlevel); | 2864 | // randomizeWater(waterlevel); |
| 2865 | 2865 | ||
| 2866 | int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests(); | 2866 | //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests(); |
| 2867 | m_rayCastManager.ProcessQueuedRequests(); | ||
| 2867 | 2868 | ||
| 2868 | collision_optimized(timeStep); | 2869 | collision_optimized(timeStep); |
| 2869 | 2870 | ||