Merge branch 'master' into vehicles

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
 
         public override void UpdateMovement()
         {
-            UpdateGroupRotationR(m_rootPart.RotationOffset * m_rotationDirection);
+            UpdateGroupRotation(GroupRotation * m_rotationDirection);
+
             base.UpdateMovement();
         }