diff options
author | Melanie | 2013-02-12 01:02:16 +0100 |
---|---|---|
committer | Melanie | 2013-02-12 01:02:16 +0100 |
commit | 04235e58e87ae42617111cad2884e42785914d4e (patch) | |
tree | 9cccb05ea7355be02d2e4d9bef5b9b1da3225afa /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Make keyframes use the sim's frame timer (diff) | |
download | opensim-SC-04235e58e87ae42617111cad2884e42785914d4e.zip opensim-SC-04235e58e87ae42617111cad2884e42785914d4e.tar.gz opensim-SC-04235e58e87ae42617111cad2884e42785914d4e.tar.bz2 opensim-SC-04235e58e87ae42617111cad2884e42785914d4e.tar.xz |
Push updates from keyframe directly to the front of the output queue rather
than through the update system.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 20a6626..7e94eda 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -3315,6 +3315,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3315 | /// </summary> | 3315 | /// </summary> |
3316 | public void SendTerseUpdateToAllClients() | 3316 | public void SendTerseUpdateToAllClients() |
3317 | { | 3317 | { |
3318 | SendTerseUpdateToAllClients(0); | ||
3319 | } | ||
3320 | |||
3321 | public void SendTerseUpdateToAllClients(PrimUpdateFlags flags) | ||
3322 | { | ||
3318 | if (ParentGroup == null || ParentGroup.Scene == null) | 3323 | if (ParentGroup == null || ParentGroup.Scene == null) |
3319 | return; | 3324 | return; |
3320 | 3325 | ||
@@ -3328,7 +3333,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3328 | 3333 | ||
3329 | ParentGroup.Scene.ForEachClient(delegate(IClientAPI client) | 3334 | ParentGroup.Scene.ForEachClient(delegate(IClientAPI client) |
3330 | { | 3335 | { |
3331 | SendTerseUpdateToClient(client); | 3336 | SendTerseUpdateToClient(client, flags); |
3332 | }); | 3337 | }); |
3333 | } | 3338 | } |
3334 | 3339 | ||
@@ -5133,6 +5138,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
5133 | 5138 | ||
5134 | public void SendTerseUpdateToClient(IClientAPI remoteClient) | 5139 | public void SendTerseUpdateToClient(IClientAPI remoteClient) |
5135 | { | 5140 | { |
5141 | SendTerseUpdateToClient(remoteClient, 0); | ||
5142 | } | ||
5143 | |||
5144 | public void SendTerseUpdateToClient(IClientAPI remoteClient, PrimUpdateFlags flags) | ||
5145 | { | ||
5136 | if (ParentGroup.IsDeleted) | 5146 | if (ParentGroup.IsDeleted) |
5137 | return; | 5147 | return; |
5138 | 5148 | ||
@@ -5146,7 +5156,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5146 | remoteClient.SendEntityUpdate( | 5156 | remoteClient.SendEntityUpdate( |
5147 | this, | 5157 | this, |
5148 | PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | 5158 | PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity |
5149 | | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity); | 5159 | | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity | flags); |
5150 | 5160 | ||
5151 | ParentGroup.Scene.StatsReporter.AddObjectUpdates(1); | 5161 | ParentGroup.Scene.StatsReporter.AddObjectUpdates(1); |
5152 | } | 5162 | } |