aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-14 01:45:46 +0100
committerJustin Clark-Casey (justincc)2011-10-14 01:45:46 +0100
commitaa19ccf65c9cd235e0ba941e9832c5240df4412c (patch)
tree48eabbf61b9f39c6b5d1310cfefe3083a5ca4bde
parentExtract NullPhysicsScene from PhysicsScene to improve code readability (diff)
downloadopensim-SC_OLD-aa19ccf65c9cd235e0ba941e9832c5240df4412c.zip
opensim-SC_OLD-aa19ccf65c9cd235e0ba941e9832c5240df4412c.tar.gz
opensim-SC_OLD-aa19ccf65c9cd235e0ba941e9832c5240df4412c.tar.bz2
opensim-SC_OLD-aa19ccf65c9cd235e0ba941e9832c5240df4412c.tar.xz
refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims.
-rw-r--r--OpenSim/Framework/IClientAPI.cs9
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
7 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d8ccc89..c1770a1 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1095,7 +1095,14 @@ namespace OpenSim.Framework
1095 void SetChildAgentThrottle(byte[] throttle); 1095 void SetChildAgentThrottle(byte[] throttle);
1096 1096
1097 void SendAvatarDataImmediate(ISceneEntity avatar); 1097 void SendAvatarDataImmediate(ISceneEntity avatar);
1098 void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags); 1098
1099 /// <summary>
1100 /// Send a positional, velocity, etc. update to the viewer for a given entity.
1101 /// </summary>
1102 /// <param name="entity"></param>
1103 /// <param name="updateFlags"></param>
1104 void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags);
1105
1099 void ReprioritizeUpdates(); 1106 void ReprioritizeUpdates();
1100 void FlushPrimUpdates(); 1107 void FlushPrimUpdates();
1101 1108
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 024ebce..c30e559 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3592,7 +3592,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3592 /// Generate one of the object update packets based on PrimUpdateFlags 3592 /// Generate one of the object update packets based on PrimUpdateFlags
3593 /// and broadcast the packet to clients 3593 /// and broadcast the packet to clients
3594 /// </summary> 3594 /// </summary>
3595 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3595 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3596 { 3596 {
3597 //double priority = m_prioritizer.GetUpdatePriority(this, entity); 3597 //double priority = m_prioritizer.GetUpdatePriority(this, entity);
3598 uint priority = m_prioritizer.GetUpdatePriority(this, entity); 3598 uint priority = m_prioritizer.GetUpdatePriority(this, entity);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4abece1..e52131e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3017,7 +3017,7 @@ namespace OpenSim.Region.Framework.Scenes
3017 //if (LocalId != ParentGroup.RootPart.LocalId) 3017 //if (LocalId != ParentGroup.RootPart.LocalId)
3018 //isattachment = ParentGroup.RootPart.IsAttachment; 3018 //isattachment = ParentGroup.RootPart.IsAttachment;
3019 3019
3020 remoteClient.SendPrimUpdate(this, PrimUpdateFlags.FullUpdate); 3020 remoteClient.SendEntityUpdate(this, PrimUpdateFlags.FullUpdate);
3021 ParentGroup.Scene.StatsReporter.AddObjectUpdates(1); 3021 ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);
3022 } 3022 }
3023 3023
@@ -4793,7 +4793,7 @@ namespace OpenSim.Region.Framework.Scenes
4793 4793
4794 // Causes this thread to dig into the Client Thread Data. 4794 // Causes this thread to dig into the Client Thread Data.
4795 // Remember your locking here! 4795 // Remember your locking here!
4796 remoteClient.SendPrimUpdate( 4796 remoteClient.SendEntityUpdate(
4797 this, 4797 this,
4798 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity 4798 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
4799 | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); 4799 | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 93a25b5..972e7fc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2447,7 +2447,7 @@ namespace OpenSim.Region.Framework.Scenes
2447 2447
2448 //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity); 2448 //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity);
2449 2449
2450 remoteClient.SendPrimUpdate( 2450 remoteClient.SendEntityUpdate(
2451 this, 2451 this,
2452 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity 2452 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
2453 | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); 2453 | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index f6656c2..84f45a8 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1062,7 +1062,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1062 1062
1063 } 1063 }
1064 1064
1065 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 1065 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
1066 { 1066 {
1067 1067
1068 } 1068 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index edb618e..73d8828 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -640,7 +640,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
640 { 640 {
641 } 641 }
642 642
643 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 643 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
644 { 644 {
645 } 645 }
646 646
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 71f2bf4..f75a815 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -645,7 +645,7 @@ namespace OpenSim.Tests.Common.Mock
645 { 645 {
646 } 646 }
647 647
648 public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 648 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
649 { 649 {
650 } 650 }
651 651