diff options
| author | BlueWall | 2012-10-20 05:25:58 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-20 05:25:58 -0400 |
| commit | 07f1d44174f5e2b4e3d5ffdec3619bb84f357af2 (patch) | |
| tree | 83cc0442b2c1b89a5b3dd94cff23d5098415777e /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (impl... (diff) | |
| download | opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.zip opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.gz opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.bz2 opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.xz | |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index cbe21e2..d53bd90 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -4320,4 +4320,4 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 4320 | m_stats[ODEPrimUpdateFrameMsStatName] = 0; | 4320 | m_stats[ODEPrimUpdateFrameMsStatName] = 0; |
| 4321 | } | 4321 | } |
| 4322 | } | 4322 | } |
| 4323 | } \ No newline at end of file | 4323 | } |