diff options
| author | Melanie | 2012-04-03 23:13:48 +0200 |
|---|---|---|
| committer | Melanie | 2012-04-03 23:13:48 +0200 |
| commit | 1c4bcf3fedbdb3c8143f364c43c939da810e896e (patch) | |
| tree | 909343f4755aa120458462c4534b89d5ab9d959e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-1c4bcf3fedbdb3c8143f364c43c939da810e896e.zip opensim-SC_OLD-1c4bcf3fedbdb3c8143f364c43c939da810e896e.tar.gz opensim-SC_OLD-1c4bcf3fedbdb3c8143f364c43c939da810e896e.tar.bz2 opensim-SC_OLD-1c4bcf3fedbdb3c8143f364c43c939da810e896e.tar.xz | |
Fix merge artefacts
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 83b0b18..9ba3e92 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1803,7 +1803,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1803 | impulse = newimpulse; | 1803 | impulse = newimpulse; |
| 1804 | } | 1804 | } |
| 1805 | 1805 | ||
| 1806 | ParentGroup.applyAngularImpulse(impulse); | 1806 | ParentGroup.setAngularImpulse(impulse); |
| 1807 | } | 1807 | } |
| 1808 | 1808 | ||
| 1809 | /// <summary> | 1809 | /// <summary> |