From 7bf1986e9138df4629aa9323d3ba9fab5c884400 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 3 Apr 2013 00:24:33 +0100 Subject: [PATCH 1/2] Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent values could be returned if the sit orientation was changed whilst the property was being fetched. --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 76974111f0..93d4da0713 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -1152,17 +1152,8 @@ namespace OpenSim.Region.Framework.Scenes public Quaternion SitTargetOrientationLL { - get - { - return new Quaternion( - m_sitTargetOrientation.X, - m_sitTargetOrientation.Y, - m_sitTargetOrientation.Z, - m_sitTargetOrientation.W - ); - } - - set { m_sitTargetOrientation = new Quaternion(value.X, value.Y, value.Z, value.W); } + get { return m_sitTargetOrientation; } + set { m_sitTargetOrientation = value; } } public bool Stopped From 94d44142e37a9191162a426f28dd23f40b0cf4aa Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 3 Apr 2013 00:48:36 +0100 Subject: [PATCH 2/2] minor: Stop falsely logging that a teleport was being aborted on client logout even when no teleport was active. --- .../Framework/EntityTransfer/EntityTransferModule.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 3e69bf27f4..ca0cef1ea8 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -280,10 +280,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer private void OnConnectionClosed(IClientAPI client) { - if (client.IsLoggingOut) + if (client.IsLoggingOut && m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting)) { - m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting); - m_log.DebugFormat( "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", client.Name, Scene.Name);