diff options
author | John Hurliman | 2009-10-22 11:07:43 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-22 11:07:43 -0700 |
commit | 11013ad2956a87a5641ee2245fe81e5f3dfec268 (patch) | |
tree | 0a0a1cc7019c21e6083d80454228729d55e0ee40 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Terrible typo in the previous commit! (diff) | |
parent | Correct version number after merge (diff) | |
download | opensim-SC_OLD-11013ad2956a87a5641ee2245fe81e5f3dfec268.zip opensim-SC_OLD-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.gz opensim-SC_OLD-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.bz2 opensim-SC_OLD-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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 e51f6ef..deee6c3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1231 | { | 1231 | { |
1232 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) | 1232 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) |
1233 | { | 1233 | { |
1234 | group.UpdateGroupRotation(rot); | 1234 | group.UpdateGroupRotationR(rot); |
1235 | } | 1235 | } |
1236 | } | 1236 | } |
1237 | } | 1237 | } |
@@ -1250,7 +1250,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1250 | { | 1250 | { |
1251 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) | 1251 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) |
1252 | { | 1252 | { |
1253 | group.UpdateGroupRotation(pos, rot); | 1253 | group.UpdateGroupRotationPR(pos, rot); |
1254 | } | 1254 | } |
1255 | } | 1255 | } |
1256 | } | 1256 | } |
@@ -1806,7 +1806,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1806 | 1806 | ||
1807 | if (rot != Quaternion.Identity) | 1807 | if (rot != Quaternion.Identity) |
1808 | { | 1808 | { |
1809 | copy.UpdateGroupRotation(rot); | 1809 | copy.UpdateGroupRotationR(rot); |
1810 | } | 1810 | } |
1811 | 1811 | ||
1812 | copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 0); | 1812 | copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 0); |