diff options
| author | Justin Clark-Casey (justincc) | 2012-10-18 23:32:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-18 23:32:40 +0100 |
| commit | 8aa43e72e53cf57047be979499b31c2a970b0324 (patch) | |
| tree | 3f467214f8e2d77b57d258a3bc3571cc8d2648ff /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
| parent | Add number of inventory items to information displayed via "show part" consol... (diff) | |
| parent | Remove extraneous calls to the now commented CheckSculptAndLoad (diff) | |
| download | opensim-SC-8aa43e72e53cf57047be979499b31c2a970b0324.zip opensim-SC-8aa43e72e53cf57047be979499b31c2a970b0324.tar.gz opensim-SC-8aa43e72e53cf57047be979499b31c2a970b0324.tar.bz2 opensim-SC-8aa43e72e53cf57047be979499b31c2a970b0324.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 | } |