diff options
| author | Justin Clark-Casey (justincc) | 2012-07-20 23:47:25 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-07-20 23:47:25 +0100 |
| commit | 1b1418e1deea2e3a302823fa6de962866a988222 (patch) | |
| tree | 8d8cd5826c3b8d261488f368dc896195a1c41a3e /OpenSim/Region/Physics/BulletSPlugin | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled b... (diff) | |
| download | opensim-SC_OLD-1b1418e1deea2e3a302823fa6de962866a988222.zip opensim-SC_OLD-1b1418e1deea2e3a302823fa6de962866a988222.tar.gz opensim-SC_OLD-1b1418e1deea2e3a302823fa6de962866a988222.tar.bz2 opensim-SC_OLD-1b1418e1deea2e3a302823fa6de962866a988222.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 9d41ce8..8773485 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -31,8 +31,9 @@ using System.Text; | |||
| 31 | using System.Threading; | 31 | using System.Threading; |
| 32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
| 33 | using OpenSim.Region.Framework; | 33 | using OpenSim.Region.Framework; |
| 34 | using OpenSim.Region.Physics.Manager; | 34 | using OpenSim.Region.CoreModules; |
| 35 | using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; | 35 | using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; |
| 36 | using OpenSim.Region.Physics.Manager; | ||
| 36 | using Nini.Config; | 37 | using Nini.Config; |
| 37 | using log4net; | 38 | using log4net; |
| 38 | using OpenMetaverse; | 39 | using OpenMetaverse; |