aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-28 15:11:01 -0700
committerJohn Hurliman2009-10-28 15:11:01 -0700
commit1c9696a9d2665b72ecde45fdcc43c1cde2abad79 (patch)
tree70985451e564e25ddf58ea109fd9d239c9345c13 /OpenSim/Region/Framework
parentLimit physics time dilation to 1.0 (diff)
downloadopensim-SC_OLD-1c9696a9d2665b72ecde45fdcc43c1cde2abad79.zip
opensim-SC_OLD-1c9696a9d2665b72ecde45fdcc43c1cde2abad79.tar.gz
opensim-SC_OLD-1c9696a9d2665b72ecde45fdcc43c1cde2abad79.tar.bz2
opensim-SC_OLD-1c9696a9d2665b72ecde45fdcc43c1cde2abad79.tar.xz
Always send a time dilation of 1.0 while we debug rubberbanding issues
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 38a0cff..dbb06f8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1015,9 +1015,9 @@ namespace OpenSim.Region.Framework.Scenes
1015 } 1015 }
1016 } 1016 }
1017 1017
1018 public float GetTimeDilation() 1018 public ushort GetTimeDilation()
1019 { 1019 {
1020 return m_scene.TimeDilation; 1020 return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
1021 } 1021 }
1022 1022
1023 /// <summary> 1023 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c16c4fe..cf1c394 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2383,7 +2383,7 @@ if (m_shape != null) {
2383 //isattachment = ParentGroup.RootPart.IsAttachment; 2383 //isattachment = ParentGroup.RootPart.IsAttachment;
2384 2384
2385 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; 2385 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
2386 remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, 2386 remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape,
2387 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, 2387 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID,
2388 m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, 2388 m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
2389 AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient))); 2389 AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient)));
@@ -3785,8 +3785,7 @@ if (m_shape != null) {
3785 // Causes this thread to dig into the Client Thread Data. 3785 // Causes this thread to dig into the Client Thread Data.
3786 // Remember your locking here! 3786 // Remember your locking here!
3787 remoteClient.SendPrimTerseUpdate(new SendPrimitiveTerseData(m_regionHandle, 3787 remoteClient.SendPrimTerseUpdate(new SendPrimitiveTerseData(m_regionHandle,
3788 (ushort)(m_parentGroup.GetTimeDilation() * 3788 m_parentGroup.GetTimeDilation(), LocalId, lPos,
3789 (float)ushort.MaxValue), LocalId, lPos,
3790 RotationOffset, Velocity, Acceleration, 3789 RotationOffset, Velocity, Acceleration,
3791 RotationalVelocity, state, FromItemID, 3790 RotationalVelocity, state, FromItemID,
3792 OwnerID, (int)AttachmentPoint, null, ParentGroup.GetUpdatePriority(remoteClient))); 3791 OwnerID, (int)AttachmentPoint, null, ParentGroup.GetUpdatePriority(remoteClient)));