diff options
| author | onefang | 2019-09-11 16:36:50 +1000 |
|---|---|---|
| committer | onefang | 2019-09-11 16:36:50 +1000 |
| commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
| tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs | |
| parent | Renamed branch to SledjChisl. (diff) | |
| parent | Bump to release flavour, build 0. (diff) | |
| download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz | |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs index d8ed56b..3f90fc5 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs | |||
| @@ -81,7 +81,6 @@ public class BSPrimDisplaced : BSPrim | |||
| 81 | // Called at taint time. | 81 | // Called at taint time. |
| 82 | public virtual Vector3 SetEffectiveCenterOfMassDisplacement(Vector3 centerOfMassDisplacement) | 82 | public virtual Vector3 SetEffectiveCenterOfMassDisplacement(Vector3 centerOfMassDisplacement) |
| 83 | { | 83 | { |
| 84 | PhysScene.AssertInTaintTime("BSPrimDisplaced.SetEffectiveCenterOfMassDisplacement"); | ||
| 85 | Vector3 comDisp; | 84 | Vector3 comDisp; |
| 86 | if (UserSetCenterOfMassDisplacement.HasValue) | 85 | if (UserSetCenterOfMassDisplacement.HasValue) |
| 87 | comDisp = (OMV.Vector3)UserSetCenterOfMassDisplacement; | 86 | comDisp = (OMV.Vector3)UserSetCenterOfMassDisplacement; |