diff options
| author | Melanie | 2009-10-02 19:04:46 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 19:04:46 +0100 |
| commit | 46955f42608ceb2b76731432f536e04e85521a12 (patch) | |
| tree | 37e8591bd95de33ad0c485626c6f40f7d4bd91b5 /OpenSim/Region/Examples | |
| parent | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff) | |
| parent | Added a default for grid services in standalone. (diff) | |
| download | opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.zip opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.gz opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.bz2 opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Examples')
| -rw-r--r-- | OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index 5e87b32..f9c3fa6 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | |||
| @@ -68,7 +68,8 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 68 | 68 | ||
| 69 | public override void UpdateMovement() | 69 | public override void UpdateMovement() |
| 70 | { | 70 | { |
| 71 | UpdateGroupRotationR(m_rootPart.RotationOffset * m_rotationDirection); | 71 | UpdateGroupRotation(GroupRotation * m_rotationDirection); |
| 72 | |||
| 72 | base.UpdateMovement(); | 73 | base.UpdateMovement(); |
| 73 | } | 74 | } |
| 74 | 75 | ||