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/Framework/Scenes | |
parent | Extract NullPhysicsScene from PhysicsScene to improve code readability (diff) | |
download | opensim-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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 3 insertions, 3 deletions
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); |