diff options
author | Justin Clark-Casey (justincc) | 2011-07-19 03:44:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-19 03:44:49 +0100 |
commit | 4b9ef4f39c420b99568b853b627ad83d253ac2c9 (patch) | |
tree | bd8d354fb91615e531eec7725f790be209c06149 | |
parent | Stop undo of just the root prim position in the linkset from shifting the who... (diff) | |
download | opensim-SC_OLD-4b9ef4f39c420b99568b853b627ad83d253ac2c9.zip opensim-SC_OLD-4b9ef4f39c420b99568b853b627ad83d253ac2c9.tar.gz opensim-SC_OLD-4b9ef4f39c420b99568b853b627ad83d253ac2c9.tar.bz2 opensim-SC_OLD-4b9ef4f39c420b99568b853b627ad83d253ac2c9.tar.xz |
Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what it actually does and is more consistent with other method names.
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0104a96..2c71c70 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2718,10 +2718,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2718 | { | 2718 | { |
2719 | client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition; | 2719 | client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition; |
2720 | client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; | 2720 | client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; |
2721 | client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation; | 2721 | |
2722 | client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimRotation; | 2722 | client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation; |
2723 | client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation; | ||
2723 | client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation; | 2724 | client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation; |
2724 | client.OnUpdatePrimSingleRotationPosition += m_sceneGraph.UpdatePrimSingleRotationPosition; | 2725 | client.OnUpdatePrimSingleRotationPosition += m_sceneGraph.UpdatePrimSingleRotationPosition; |
2726 | |||
2725 | client.OnUpdatePrimScale += m_sceneGraph.UpdatePrimScale; | 2727 | client.OnUpdatePrimScale += m_sceneGraph.UpdatePrimScale; |
2726 | client.OnUpdatePrimGroupScale += m_sceneGraph.UpdatePrimGroupScale; | 2728 | client.OnUpdatePrimGroupScale += m_sceneGraph.UpdatePrimGroupScale; |
2727 | client.OnUpdateExtraParams += m_sceneGraph.UpdateExtraParam; | 2729 | client.OnUpdateExtraParams += m_sceneGraph.UpdateExtraParam; |
@@ -2845,10 +2847,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2845 | { | 2847 | { |
2846 | client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimPosition; | 2848 | client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimPosition; |
2847 | client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition; | 2849 | client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition; |
2848 | client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimRotation; | 2850 | |
2849 | client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimRotation; | 2851 | client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation; |
2852 | client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimGroupRotation; | ||
2850 | client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation; | 2853 | client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation; |
2851 | client.OnUpdatePrimSingleRotationPosition -= m_sceneGraph.UpdatePrimSingleRotationPosition; | 2854 | client.OnUpdatePrimSingleRotationPosition -= m_sceneGraph.UpdatePrimSingleRotationPosition; |
2855 | |||
2852 | client.OnUpdatePrimScale -= m_sceneGraph.UpdatePrimScale; | 2856 | client.OnUpdatePrimScale -= m_sceneGraph.UpdatePrimScale; |
2853 | client.OnUpdatePrimGroupScale -= m_sceneGraph.UpdatePrimGroupScale; | 2857 | client.OnUpdatePrimGroupScale -= m_sceneGraph.UpdatePrimGroupScale; |
2854 | client.OnUpdateExtraParams -= m_sceneGraph.UpdateExtraParam; | 2858 | client.OnUpdateExtraParams -= m_sceneGraph.UpdateExtraParam; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 26857c2..d5e0bbb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1297,12 +1297,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1297 | } | 1297 | } |
1298 | 1298 | ||
1299 | /// <summary> | 1299 | /// <summary> |
1300 | /// | 1300 | /// Update the rotation of a whole group. |
1301 | /// </summary> | 1301 | /// </summary> |
1302 | /// <param name="localID"></param> | 1302 | /// <param name="localID"></param> |
1303 | /// <param name="rot"></param> | 1303 | /// <param name="rot"></param> |
1304 | /// <param name="remoteClient"></param> | 1304 | /// <param name="remoteClient"></param> |
1305 | protected internal void UpdatePrimRotation(uint localID, Quaternion rot, IClientAPI remoteClient) | 1305 | protected internal void UpdatePrimGroupRotation(uint localID, Quaternion rot, IClientAPI remoteClient) |
1306 | { | 1306 | { |
1307 | SceneObjectGroup group = GetGroupByPrim(localID); | 1307 | SceneObjectGroup group = GetGroupByPrim(localID); |
1308 | if (group != null) | 1308 | if (group != null) |
@@ -1321,7 +1321,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1321 | /// <param name="pos"></param> | 1321 | /// <param name="pos"></param> |
1322 | /// <param name="rot"></param> | 1322 | /// <param name="rot"></param> |
1323 | /// <param name="remoteClient"></param> | 1323 | /// <param name="remoteClient"></param> |
1324 | protected internal void UpdatePrimRotation(uint localID, Vector3 pos, Quaternion rot, IClientAPI remoteClient) | 1324 | protected internal void UpdatePrimGroupRotation(uint localID, Vector3 pos, Quaternion rot, IClientAPI remoteClient) |
1325 | { | 1325 | { |
1326 | SceneObjectGroup group = GetGroupByPrim(localID); | 1326 | SceneObjectGroup group = GetGroupByPrim(localID); |
1327 | if (group != null) | 1327 | if (group != null) |