aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2013-02-12 03:15:40 +0100
committerMelanie2013-02-12 03:15:40 +0100
commit14c064c65da3d9cce045664f83daaeb7a79edcdd (patch)
tree9b21d8a9022750c84e8f90a7440d4ba2830d3ead /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentRevert "Use actual time dilation for unqueued updates" (diff)
downloadopensim-SC-14c064c65da3d9cce045664f83daaeb7a79edcdd.zip
opensim-SC-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.gz
opensim-SC-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.bz2
opensim-SC-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.xz
Revert "Push updates from keyframe directly to the front of the output queue rather"
This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs14
1 files changed, 2 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 7e94eda..20a6626 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3315,11 +3315,6 @@ 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 {
3323 if (ParentGroup == null || ParentGroup.Scene == null) 3318 if (ParentGroup == null || ParentGroup.Scene == null)
3324 return; 3319 return;
3325 3320
@@ -3333,7 +3328,7 @@ namespace OpenSim.Region.Framework.Scenes
3333 3328
3334 ParentGroup.Scene.ForEachClient(delegate(IClientAPI client) 3329 ParentGroup.Scene.ForEachClient(delegate(IClientAPI client)
3335 { 3330 {
3336 SendTerseUpdateToClient(client, flags); 3331 SendTerseUpdateToClient(client);
3337 }); 3332 });
3338 } 3333 }
3339 3334
@@ -5138,11 +5133,6 @@ namespace OpenSim.Region.Framework.Scenes
5138 5133
5139 public void SendTerseUpdateToClient(IClientAPI remoteClient) 5134 public void SendTerseUpdateToClient(IClientAPI remoteClient)
5140 { 5135 {
5141 SendTerseUpdateToClient(remoteClient, 0);
5142 }
5143
5144 public void SendTerseUpdateToClient(IClientAPI remoteClient, PrimUpdateFlags flags)
5145 {
5146 if (ParentGroup.IsDeleted) 5136 if (ParentGroup.IsDeleted)
5147 return; 5137 return;
5148 5138
@@ -5156,7 +5146,7 @@ namespace OpenSim.Region.Framework.Scenes
5156 remoteClient.SendEntityUpdate( 5146 remoteClient.SendEntityUpdate(
5157 this, 5147 this,
5158 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity 5148 PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity
5159 | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity | flags); 5149 | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
5160 5150
5161 ParentGroup.Scene.StatsReporter.AddObjectUpdates(1); 5151 ParentGroup.Scene.StatsReporter.AddObjectUpdates(1);
5162 } 5152 }