aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-19 05:20:04 +0100
committerJustin Clark-Casey (justincc)2011-07-19 05:20:04 +0100
commit0ef29da9b2844e567928fe6fe5e13da3ee1a37ad (patch)
tree0ee9fccad22fe08d0fec627fa05db63b28d74266
parentcomment out all kinds of debugging guff (diff)
downloadopensim-SC_OLD-0ef29da9b2844e567928fe6fe5e13da3ee1a37ad.zip
opensim-SC_OLD-0ef29da9b2844e567928fe6fe5e13da3ee1a37ad.tar.gz
opensim-SC_OLD-0ef29da9b2844e567928fe6fe5e13da3ee1a37ad.tar.bz2
opensim-SC_OLD-0ef29da9b2844e567928fe6fe5e13da3ee1a37ad.tar.xz
refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consistency
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2c71c70..6e66632 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2716,7 +2716,7 @@ namespace OpenSim.Region.Framework.Scenes
2716 2716
2717 public virtual void SubscribeToClientPrimEvents(IClientAPI client) 2717 public virtual void SubscribeToClientPrimEvents(IClientAPI client)
2718 { 2718 {
2719 client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition; 2719 client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition;
2720 client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; 2720 client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition;
2721 2721
2722 client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation; 2722 client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation;
@@ -2845,7 +2845,7 @@ namespace OpenSim.Region.Framework.Scenes
2845 2845
2846 public virtual void UnSubscribeToClientPrimEvents(IClientAPI client) 2846 public virtual void UnSubscribeToClientPrimEvents(IClientAPI client)
2847 { 2847 {
2848 client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimPosition; 2848 client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimGroupPosition;
2849 client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition; 2849 client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition;
2850 2850
2851 client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation; 2851 client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation;
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index d5e0bbb..65dc2c9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1352,12 +1352,12 @@ namespace OpenSim.Region.Framework.Scenes
1352 } 1352 }
1353 1353
1354 /// <summary> 1354 /// <summary>
1355 /// Update the position of the given part 1355 /// Update the position of the given group.
1356 /// </summary> 1356 /// </summary>
1357 /// <param name="localID"></param> 1357 /// <param name="localID"></param>
1358 /// <param name="pos"></param> 1358 /// <param name="pos"></param>
1359 /// <param name="remoteClient"></param> 1359 /// <param name="remoteClient"></param>
1360 public void UpdatePrimPosition(uint localID, Vector3 pos, IClientAPI remoteClient) 1360 public void UpdatePrimGroupPosition(uint localID, Vector3 pos, IClientAPI remoteClient)
1361 { 1361 {
1362 SceneObjectGroup group = GetGroupByPrim(localID); 1362 SceneObjectGroup group = GetGroupByPrim(localID);
1363 1363
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 0eaed91..26b35a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2840,10 +2840,10 @@ namespace OpenSim.Region.Framework.Scenes
2840 } 2840 }
2841 2841
2842 /// <summary> 2842 /// <summary>
2843 /// 2843 /// Update just the root prim position in a linkset
2844 /// </summary> 2844 /// </summary>
2845 /// <param name="pos"></param> 2845 /// <param name="pos"></param>
2846 private void UpdateRootPosition(Vector3 pos) 2846 public void UpdateRootPosition(Vector3 pos)
2847 { 2847 {
2848// m_log.DebugFormat( 2848// m_log.DebugFormat(
2849// "[SCENE OBJECT GROUP]: Updating root position of {0} {1} to {2}", Name, LocalId, pos); 2849// "[SCENE OBJECT GROUP]: Updating root position of {0} {1} to {2}", Name, LocalId, pos);