diff options
author | Justin Clark-Casey (justincc) | 2011-10-14 01:45:46 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-14 01:45:46 +0100 |
commit | aa19ccf65c9cd235e0ba941e9832c5240df4412c (patch) | |
tree | 48eabbf61b9f39c6b5d1310cfefe3083a5ca4bde /OpenSim/Region | |
parent | Extract NullPhysicsScene from PhysicsScene to improve code readability (diff) | |
download | opensim-SC-aa19ccf65c9cd235e0ba941e9832c5240df4412c.zip opensim-SC-aa19ccf65c9cd235e0ba941e9832c5240df4412c.tar.gz opensim-SC-aa19ccf65c9cd235e0ba941e9832c5240df4412c.tar.bz2 opensim-SC-aa19ccf65c9cd235e0ba941e9832c5240df4412c.tar.xz |
refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims.
Diffstat (limited to '')
5 files changed, 6 insertions, 6 deletions
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 | ||