diff options
| author | UbitUmarov | 2015-09-08 15:03:22 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-08 15:03:22 +0100 |
| commit | 5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch) | |
| tree | 03077685e44648264523e1851cd068d51a507e81 /OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |
| parent | add script events per sec stat, using the time report code, but ignoring the... (diff) | |
| parent | More 'everything is a module' merging. (diff) | |
| download | opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz | |
Merge branch 'mbworknew1' into ubitworkvarnew
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs (renamed from OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs) | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index a00991f..6f27ac7 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |||
| @@ -32,11 +32,10 @@ using System.Xml; | |||
| 32 | using log4net; | 32 | using log4net; |
| 33 | using OMV = OpenMetaverse; | 33 | using OMV = OpenMetaverse; |
| 34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
| 35 | using OpenSim.Region.Physics.Manager; | 35 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 36 | using OpenSim.Region.Physics.ConvexDecompositionDotNet; | 36 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; |
| 37 | using OpenSim.Region.OptionalModules.Scripting; // for ExtendedPhysics | ||
| 38 | 37 | ||
| 39 | namespace OpenSim.Region.Physics.BulletSPlugin | 38 | namespace OpenSim.Region.PhysicsModule.BulletS |
| 40 | { | 39 | { |
| 41 | 40 | ||
| 42 | [Serializable] | 41 | [Serializable] |