Easy on locking m_scenePresences in RequestTeleportLocation. With the extra locks of SceneGraph ScenePresences introduced in 7982, this was making TPs not close the agent in the departing region due to locking. That locking problem seemed to occur only in Linux/mono -- I suspect a mono bug here.
parent
1c3542303c
commit
866c85be0d
|
@ -3139,13 +3139,16 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
public void RequestTeleportLocation(IClientAPI remoteClient, ulong regionHandle, Vector3 position,
|
||||
Vector3 lookAt, uint teleportFlags)
|
||||
{
|
||||
ScenePresence sp = null;
|
||||
lock (m_scenePresences)
|
||||
{
|
||||
if (m_scenePresences.ContainsKey(remoteClient.AgentId))
|
||||
{
|
||||
m_sceneGridService.RequestTeleportToLocation(m_scenePresences[remoteClient.AgentId], regionHandle,
|
||||
position, lookAt, teleportFlags);
|
||||
}
|
||||
sp = m_scenePresences[remoteClient.AgentId];
|
||||
}
|
||||
if (sp!= null)
|
||||
{
|
||||
m_sceneGridService.RequestTeleportToLocation(sp, regionHandle,
|
||||
position, lookAt, teleportFlags);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue