diff options
| author | Melanie | 2012-10-18 20:56:34 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-18 20:56:34 +0100 |
| commit | 72c925a6c9eb4dea6f9134db10c3af28ea83df48 (patch) | |
| tree | 9f991ade4e71f91fc612759b4e783c9f01a740f3 /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove redundant and annoyingly modal message box in upload processing. (diff) | |
| download | opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.zip opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.gz opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.bz2 opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
Diffstat (limited to '')
| -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 | } |