diff options
| author | Dahlia Trimble | 2008-09-29 19:01:45 +0000 |
|---|---|---|
| committer | Dahlia Trimble | 2008-09-29 19:01:45 +0000 |
| commit | 5eb433ae26792c18fe29b1496946a0c1b26a21ec (patch) | |
| tree | 5f4c6cfc8c74e92d4a1df256649b7139e2611c2e /OpenSim | |
| parent | From: rob smart (smartrob@uk.ibm.com) (diff) | |
| download | opensim-SC_OLD-5eb433ae26792c18fe29b1496946a0c1b26a21ec.zip opensim-SC_OLD-5eb433ae26792c18fe29b1496946a0c1b26a21ec.tar.gz opensim-SC_OLD-5eb433ae26792c18fe29b1496946a0c1b26a21ec.tar.bz2 opensim-SC_OLD-5eb433ae26792c18fe29b1496946a0c1b26a21ec.tar.xz | |
ApplyImpulse now forwards impulse in both local and global modes.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 17d678d..c887b78 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -1156,13 +1156,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1156 | Vector3 newimpulse = AXimpulsei * AXgrot; | 1156 | Vector3 newimpulse = AXimpulsei * AXgrot; |
| 1157 | impulse = new PhysicsVector(newimpulse.X, newimpulse.Y, newimpulse.Z); | 1157 | impulse = new PhysicsVector(newimpulse.X, newimpulse.Y, newimpulse.Z); |
| 1158 | } | 1158 | } |
| 1159 | else | ||
| 1160 | { | ||
| 1161 | 1159 | ||
| 1162 | if (m_parentGroup != null) | 1160 | if (m_parentGroup != null) |
| 1163 | { | 1161 | { |
| 1164 | m_parentGroup.applyImpulse(impulse); | 1162 | m_parentGroup.applyImpulse(impulse); |
| 1165 | } | ||
| 1166 | } | 1163 | } |
| 1167 | } | 1164 | } |
| 1168 | 1165 | ||