ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2011-12-14 08:57:55 +00:00
parent df65245671 f43e5f92fd
commit 898549d13e
8 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -269,8 +269,6 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_passTouches;
private UpdateRequired m_updateFlag;
private PhysicsActor m_physActor;
protected Vector3 m_acceleration;
protected Vector3 m_angularVelocity;
@@ -1035,11 +1033,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public UpdateRequired UpdateFlag
{
get { return m_updateFlag; }
set { m_updateFlag = value; }
}
public UpdateRequired UpdateFlag { get; set; }
/// <summary>
/// Used for media on a prim.
@@ -2999,6 +2993,7 @@ namespace OpenSim.Region.Framework.Scenes
{
case UpdateRequired.TERSE:
{
ClearUpdateSchedule();
// Throw away duplicate or insignificant updates
if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
!Acceleration.Equals(m_lastAcceleration) ||
@@ -3008,9 +3003,7 @@ namespace OpenSim.Region.Framework.Scenes
!OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
{
SendTerseUpdateToAllClients();
ClearUpdateSchedule();
// Update the "last" values
m_lastPosition = OffsetPosition;
@@ -3024,12 +3017,11 @@ namespace OpenSim.Region.Framework.Scenes
}
case UpdateRequired.FULL:
{
ClearUpdateSchedule();
SendFullUpdateToAllClients();
break;
}
}
ClearUpdateSchedule();
}
/// <summary>