Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 3809749..e951bef 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -68,11 +68,15 @@ namespace OpenSim.Region.Examples.SimpleModule
 
         public override void UpdateMovement()
         {
-            UpdateGroupRotation(GroupRotation * m_rotationDirection);
+            UpdateGroupRotationR(GroupRotation * m_rotationDirection);
 
             base.UpdateMovement();
         }
 
+        public ComplexObject()
+        {
+        }
+
         public ComplexObject(Scene scene, ulong regionHandle, UUID ownerID, uint localID, Vector3 pos)
             : base(ownerID, pos, PrimitiveBaseShape.Default)
         {