diff options
7 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index f02543d..0557fb6 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1101,7 +1101,14 @@ namespace OpenSim.Framework | |||
1101 | void SetChildAgentThrottle(byte[] throttle); | 1101 | void SetChildAgentThrottle(byte[] throttle); |
1102 | 1102 | ||
1103 | void SendAvatarDataImmediate(ISceneEntity avatar); | 1103 | void SendAvatarDataImmediate(ISceneEntity avatar); |
1104 | void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags); | 1104 | |
1105 | /// <summary> | ||
1106 | /// Send a positional, velocity, etc. update to the viewer for a given entity. | ||
1107 | /// </summary> | ||
1108 | /// <param name="entity"></param> | ||
1109 | /// <param name="updateFlags"></param> | ||
1110 | void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags); | ||
1111 | |||
1105 | void ReprioritizeUpdates(); | 1112 | void ReprioritizeUpdates(); |
1106 | void FlushPrimUpdates(); | 1113 | void FlushPrimUpdates(); |
1107 | 1114 | ||
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index d579f91..2f16e04 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -3619,7 +3619,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3619 | /// Generate one of the object update packets based on PrimUpdateFlags | 3619 | /// Generate one of the object update packets based on PrimUpdateFlags |
3620 | /// and broadcast the packet to clients | 3620 | /// and broadcast the packet to clients |
3621 | /// </summary> | 3621 | /// </summary> |
3622 | public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) | 3622 | public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) |
3623 | { | 3623 | { |
3624 | if (entity is SceneObjectPart) | 3624 | if (entity is SceneObjectPart) |
3625 | { | 3625 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c6264b5..370c55b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -3071,7 +3071,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3071 | //if (LocalId != ParentGroup.RootPart.LocalId) | 3071 | //if (LocalId != ParentGroup.RootPart.LocalId) |
3072 | //isattachment = ParentGroup.RootPart.IsAttachment; | 3072 | //isattachment = ParentGroup.RootPart.IsAttachment; |
3073 | 3073 | ||
3074 | remoteClient.SendPrimUpdate(this, PrimUpdateFlags.FullUpdate); | 3074 | remoteClient.SendEntityUpdate(this, PrimUpdateFlags.FullUpdate); |
3075 | ParentGroup.Scene.StatsReporter.AddObjectUpdates(1); | 3075 | ParentGroup.Scene.StatsReporter.AddObjectUpdates(1); |
3076 | } | 3076 | } |
3077 | 3077 | ||
@@ -4849,7 +4849,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4849 | 4849 | ||
4850 | // Causes this thread to dig into the Client Thread Data. | 4850 | // Causes this thread to dig into the Client Thread Data. |
4851 | // Remember your locking here! | 4851 | // Remember your locking here! |
4852 | remoteClient.SendPrimUpdate( | 4852 | remoteClient.SendEntityUpdate( |
4853 | this, | 4853 | this, |
4854 | PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | 4854 | PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity |
4855 | | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); | 4855 | | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3dec218..bdfad40 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2808,7 +2808,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2808 | 2808 | ||
2809 | //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity); | 2809 | //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity); |
2810 | 2810 | ||
2811 | remoteClient.SendPrimUpdate( | 2811 | remoteClient.SendEntityUpdate( |
2812 | this, | 2812 | this, |
2813 | PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | 2813 | PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity |
2814 | | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); | 2814 | | 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 c92f121..a3b65cf 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -1068,7 +1068,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1068 | 1068 | ||
1069 | } | 1069 | } |
1070 | 1070 | ||
1071 | public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) | 1071 | public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) |
1072 | { | 1072 | { |
1073 | 1073 | ||
1074 | } | 1074 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 253fdee..fd2b9c7 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 b4f521f..e34721e 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 | ||