diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2e15b86..a430b1e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1266,7 +1266,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1266 | // allocations, and there is no more work to be done until someone logs in | 1266 | // allocations, and there is no more work to be done until someone logs in |
1267 | GC.Collect(); | 1267 | GC.Collect(); |
1268 | 1268 | ||
1269 | m_log.DebugFormat("[REGION]: Enabling Logins for {0}", RegionInfo.RegionName); | 1269 | m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); |
1270 | loginsdisabled = false; | 1270 | loginsdisabled = false; |
1271 | } | 1271 | } |
1272 | } | 1272 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index bf2f3d3..10b7d94 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2075,6 +2075,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2075 | { | 2075 | { |
2076 | if (PhysActor != null) | 2076 | if (PhysActor != null) |
2077 | { | 2077 | { |
2078 | |||
2078 | Vector3 newpos = new Vector3(PhysActor.Position.GetBytes(), 0); | 2079 | Vector3 newpos = new Vector3(PhysActor.Position.GetBytes(), 0); |
2079 | 2080 | ||
2080 | if (m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.N) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.S) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.E) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) | 2081 | if (m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.N) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.S) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.E) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) |
@@ -2082,6 +2083,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2082 | m_parentGroup.AbsolutePosition = newpos; | 2083 | m_parentGroup.AbsolutePosition = newpos; |
2083 | return; | 2084 | return; |
2084 | } | 2085 | } |
2086 | //m_parentGroup.RootPart.m_groupPosition = newpos; | ||
2085 | } | 2087 | } |
2086 | ScheduleTerseUpdate(); | 2088 | ScheduleTerseUpdate(); |
2087 | 2089 | ||
@@ -2393,6 +2395,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2393 | if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || | 2395 | if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || |
2394 | !Acceleration.Equals(m_lastAcceleration) || | 2396 | !Acceleration.Equals(m_lastAcceleration) || |
2395 | !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) || | 2397 | !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) || |
2398 | Velocity.ApproxEquals(Vector3.Zero, VELOCITY_TOLERANCE) || | ||
2396 | !AngularVelocity.ApproxEquals(m_lastAngularVelocity, VELOCITY_TOLERANCE) || | 2399 | !AngularVelocity.ApproxEquals(m_lastAngularVelocity, VELOCITY_TOLERANCE) || |
2397 | !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || | 2400 | !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || |
2398 | Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) | 2401 | Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) |
@@ -2427,6 +2430,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2427 | m_updateFlag = 0; //Same here | 2430 | m_updateFlag = 0; //Same here |
2428 | } | 2431 | } |
2429 | } | 2432 | } |
2433 | ClearUpdateSchedule(); | ||
2430 | } | 2434 | } |
2431 | 2435 | ||
2432 | /// <summary> | 2436 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1dedcf1..424c25b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -995,6 +995,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
995 | 995 | ||
996 | Animator.TrySetMovementAnimation("LAND"); | 996 | Animator.TrySetMovementAnimation("LAND"); |
997 | SendFullUpdateToAllClients(); | 997 | SendFullUpdateToAllClients(); |
998 | ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, | ||
999 | AbsolutePosition, Velocity, -Vector3.UnitZ, m_bodyRot, Vector4.UnitW, m_uuid, null, GetUpdatePriority(ControllingClient))); | ||
998 | } | 1000 | } |
999 | 1001 | ||
1000 | public void AddNeighbourRegion(ulong regionHandle, string cap) | 1002 | public void AddNeighbourRegion(ulong regionHandle, string cap) |