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/Framework/Scenes/Scene.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d8478a2..db107a9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2810,7 +2810,7 @@ namespace OpenSim.Region.Framework.Scenes
                             // SceneObjectGroup obj = m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, worldRot);
                             m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, worldRot);
                             //obj.Rotation = worldRot;
-                            //obj.UpdateGroupRotation(worldRot);
+                            //obj.UpdateGroupRotationR(worldRot);
                         }
                         else
                         {
@@ -4504,7 +4504,7 @@ namespace OpenSim.Region.Framework.Scenes
                         Quaternion q = trackedBody.RotationOffset * joint.LocalRotation;
 
                         jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update
-                        jointProxyObject.ParentGroup.UpdateGroupRotation(q); // schedules the entire group for a terse update
+                        jointProxyObject.ParentGroup.UpdateGroupRotationR(q); // schedules the entire group for a terse update
                     }
                     break;
             }
-- 
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/Framework/Scenes/Scene.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 55ec281..9db2240 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2305,8 +2305,8 @@ namespace OpenSim.Region.Framework.Scenes
                                 "to avatar {0} at position {1}",
                                 sp.UUID.ToString(), grp.AbsolutePosition);
                         AttachObject(sp.ControllingClient,
-                                grp.LocalId, 0,
-                                grp.Rotation,
+                                grp.LocalId, (uint)0,
+                                grp.GroupRotation,
                                 grp.AbsolutePosition, false);
                         RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                         grp.SendGroupFullUpdate();
-- 
cgit v1.1