From 827b0fb1993c6f9b1289931a1ac38ff2b810952c Mon Sep 17 00:00:00 2001
From: opensim
Date: Wed, 30 Sep 2009 18:51:02 +0200
Subject: Commit initial version of KittoFlora's vehicle changes

---
 OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Examples/SimpleModule/ComplexObject.cs')

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)
         {
-- 
cgit v1.1


From d0cc0985fac367fc996dca26baa5a042634aeab9 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 1 Oct 2009 14:45:06 +0100
Subject: Fix a merge conflict

---
 OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Examples/SimpleModule/ComplexObject.cs')

diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index e951bef..0716964 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule
 
         public override void UpdateMovement()
         {
-            UpdateGroupRotationR(GroupRotation * m_rotationDirection);
+            UpdateGroupRotationR(m_rootPart.RotationOffset * m_rotationDirection);
 
             base.UpdateMovement();
         }
-- 
cgit v1.1


From 212e132e79f868fd3bb9bcf9ef2c13eb12f8c14e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 2 Oct 2009 00:47:01 +0100
Subject: 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.
---
 OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Region/Examples/SimpleModule/ComplexObject.cs')

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


From dcdcbb314e8821aa3b589cccea45293deb10b86e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 5 Oct 2009 11:08:02 +0100
Subject: Fix build break

---
 OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Examples/SimpleModule/ComplexObject.cs')

diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index f9c3fa6..e951bef 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule
 
         public override void UpdateMovement()
         {
-            UpdateGroupRotation(GroupRotation * m_rotationDirection);
+            UpdateGroupRotationR(GroupRotation * m_rotationDirection);
 
             base.UpdateMovement();
         }
-- 
cgit v1.1