diff options
author | Melanie | 2009-09-30 17:46:04 +0100 |
---|---|---|
committer | Melanie | 2009-09-30 17:46:04 +0100 |
commit | 61d6e42af2eef27786e041cdab66c1a6faea7226 (patch) | |
tree | 67637cb65eeae3a8d174854bff667ce1ecb15fe9 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | change 0.6.7 candidate branch down to RC1 (diff) | |
parent | Merge branch '0.6.7-post-fixes' into vehicles (diff) | |
download | opensim-SC-61d6e42af2eef27786e041cdab66c1a6faea7226.zip opensim-SC-61d6e42af2eef27786e041cdab66c1a6faea7226.tar.gz opensim-SC-61d6e42af2eef27786e041cdab66c1a6faea7226.tar.bz2 opensim-SC-61d6e42af2eef27786e041cdab66c1a6faea7226.tar.xz |
Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim into vehicles
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
2810 | // SceneObjectGroup obj = m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, worldRot); | 2810 | // SceneObjectGroup obj = m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, worldRot); |
2811 | m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, worldRot); | 2811 | m_sceneGraph.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, worldRot); |
2812 | //obj.Rotation = worldRot; | 2812 | //obj.Rotation = worldRot; |
2813 | //obj.UpdateGroupRotation(worldRot); | 2813 | //obj.UpdateGroupRotationR(worldRot); |
2814 | } | 2814 | } |
2815 | else | 2815 | else |
2816 | { | 2816 | { |
@@ -4504,7 +4504,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4504 | Quaternion q = trackedBody.RotationOffset * joint.LocalRotation; | 4504 | Quaternion q = trackedBody.RotationOffset * joint.LocalRotation; |
4505 | 4505 | ||
4506 | jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update | 4506 | jointProxyObject.ParentGroup.UpdateGroupPosition(proxyPos); // schedules the entire group for a terse update |
4507 | jointProxyObject.ParentGroup.UpdateGroupRotation(q); // schedules the entire group for a terse update | 4507 | jointProxyObject.ParentGroup.UpdateGroupRotationR(q); // schedules the entire group for a terse update |
4508 | } | 4508 | } |
4509 | break; | 4509 | break; |
4510 | } | 4510 | } |