diff options
| author | Robert Adams | 2015-09-08 06:15:46 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-09-08 06:15:46 -0700 |
| commit | 4dd17c4117ea413fb0c4418511956cb3abfe258c (patch) | |
| tree | 6f31a583610f8bf074d1f0b4e7ab6ccef37dec9a /OpenSim/Region/Framework | |
| parent | Merge of ubitworkvarnew with opensim/master as of 20150905. (diff) | |
| download | opensim-SC-4dd17c4117ea413fb0c4418511956cb3abfe258c.zip opensim-SC-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.gz opensim-SC-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.bz2 opensim-SC-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.xz | |
More 'everything is a module' merging.
Have most of UbitOde converted.
There are compile errors in OpenSimBase as the new modules stuff is not all there.
Removed ChOdePlugin as it's connection to OdePlugin was tangled.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SOPVehicle.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs index b617f52..58f4641 100644 --- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs +++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs | |||
| @@ -29,7 +29,7 @@ using System; | |||
| 29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
| 30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
| 31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
| 32 | using OpenSim.Region.Physics.Manager; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 33 | using System.Text; | 33 | using System.Text; |
| 34 | using System.IO; | 34 | using System.IO; |
| 35 | using System.Xml; | 35 | using System.Xml; |