OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster

avinationmerge
Melanie 2013-04-04 03:17:38 +01:00
parent 4bc5a7aa19 94d44142e3
commit b16a560b77
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -280,10 +280,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
private void OnConnectionClosed(IClientAPI client) 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( m_log.DebugFormat(
"[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout",
client.Name, Scene.Name); client.Name, Scene.Name);

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

@ -1224,17 +1224,8 @@ namespace OpenSim.Region.Framework.Scenes
public Quaternion SitTargetOrientationLL public Quaternion SitTargetOrientationLL
{ {
get get { return m_sitTargetOrientation; }
{ set { m_sitTargetOrientation = value; }
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); }
} }
public bool Stopped public bool Stopped