From 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Wed, 16 Sep 2009 15:45:40 -0700
Subject: * Adding Scale to EntityBase * Fixing the incorrect initialization of
 EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added
 overrides for Scale/Rotation/Velocity

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

(limited to 'OpenSim/Region/Examples/SimpleModule')

diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 3809749..66f4da0 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);
+            UpdateGroupRotation(Rotation * m_rotationDirection);
 
             base.UpdateMovement();
         }
-- 
cgit v1.1


From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 1 Oct 2009 01:00:09 +0900
Subject: Formatting cleanup.

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

(limited to 'OpenSim/Region/Examples/SimpleModule')

diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index e9c35e9..f4526ae 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -789,7 +789,7 @@ namespace OpenSim.Region.Examples.SimpleModule
         
         public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
         {
-        }        
+        }
 
         public void SendViewerTime(int phase)
         {
-- 
cgit v1.1


From d6301db382111bf57a7893215ea84b7e6b09187e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 2 Oct 2009 00:45:31 +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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Examples/SimpleModule')

diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 66f4da0..3809749 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(Rotation * m_rotationDirection);
+            UpdateGroupRotation(GroupRotation * m_rotationDirection);
 
             base.UpdateMovement();
         }
-- 
cgit v1.1