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(-)

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