diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs index c4a923c..42db7fe 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSAPIUnman.cs | |||
@@ -155,8 +155,8 @@ public BSAPIUnman(string paramName, BSScene physScene) | |||
155 | 155 | ||
156 | // Initialization and simulation | 156 | // Initialization and simulation |
157 | public override BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms, | 157 | public override BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms, |
158 | int maxCollisions, ref CollisionDesc[] collisionArray, | 158 | int maxCollisions, ref CollisionDesc[] collisionArray, |
159 | int maxUpdates, ref EntityProperties[] updateArray | 159 | int maxUpdates, ref EntityProperties[] updateArray |
160 | ) | 160 | ) |
161 | { | 161 | { |
162 | // Pin down the memory that will be used to pass object collisions and updates back from unmanaged code | 162 | // Pin down the memory that will be used to pass object collisions and updates back from unmanaged code |
@@ -1472,8 +1472,8 @@ public delegate void DebugLogCallback([MarshalAs(UnmanagedType.LPStr)]string msg | |||
1472 | // Initialization and simulation | 1472 | // Initialization and simulation |
1473 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1473 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
1474 | public static extern IntPtr Initialize2(Vector3 maxPosition, IntPtr parms, | 1474 | public static extern IntPtr Initialize2(Vector3 maxPosition, IntPtr parms, |
1475 | int maxCollisions, IntPtr collisionArray, | 1475 | int maxCollisions, IntPtr collisionArray, |
1476 | int maxUpdates, IntPtr updateArray, | 1476 | int maxUpdates, IntPtr updateArray, |
1477 | DebugLogCallback logRoutine); | 1477 | DebugLogCallback logRoutine); |
1478 | 1478 | ||
1479 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 1479 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |