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/SceneGraph.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/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 48dea07..09116fa 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1236,7 +1236,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1236 | { | 1236 | { |
1237 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) | 1237 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) |
1238 | { | 1238 | { |
1239 | group.UpdateGroupRotation(rot); | 1239 | group.UpdateGroupRotationR(rot); |
1240 | } | 1240 | } |
1241 | } | 1241 | } |
1242 | } | 1242 | } |
@@ -1255,7 +1255,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1255 | { | 1255 | { |
1256 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) | 1256 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) |
1257 | { | 1257 | { |
1258 | group.UpdateGroupRotation(pos, rot); | 1258 | group.UpdateGroupRotationPR(pos, rot); |
1259 | } | 1259 | } |
1260 | } | 1260 | } |
1261 | } | 1261 | } |
@@ -1811,7 +1811,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1811 | 1811 | ||
1812 | if (rot != Quaternion.Identity) | 1812 | if (rot != Quaternion.Identity) |
1813 | { | 1813 | { |
1814 | copy.UpdateGroupRotation(rot); | 1814 | copy.UpdateGroupRotationR(rot); |
1815 | } | 1815 | } |
1816 | 1816 | ||
1817 | copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 0); | 1817 | copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 0); |