diff options
| author | Melanie | 2009-10-02 00:47:01 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 00:47:01 +0100 |
| commit | 212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e (patch) | |
| tree | 5af4731fb69cb8546a9cfb857dabbebc5f0b6ee1 /OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | |
| parent | Fix a merge conflict (diff) | |
| download | opensim-SC_OLD-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.zip opensim-SC_OLD-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.gz opensim-SC_OLD-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.bz2 opensim-SC_OLD-212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e.tar.xz | |
Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule/ComplexObject.cs')
| -rw-r--r-- | OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index 0716964..5e87b32 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | |||
| @@ -69,7 +69,6 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 69 | public override void UpdateMovement() | 69 | public override void UpdateMovement() |
| 70 | { | 70 | { |
| 71 | UpdateGroupRotationR(m_rootPart.RotationOffset * m_rotationDirection); | 71 | UpdateGroupRotationR(m_rootPart.RotationOffset * m_rotationDirection); |
| 72 | |||
| 73 | base.UpdateMovement(); | 72 | base.UpdateMovement(); |
| 74 | } | 73 | } |
| 75 | 74 | ||