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

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.

Browse Source
This commit is contained in:
diva
2009-01-14 04:18:28 +00:00
parent 1c3542303c
commit 866c85be0d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -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);
}
}