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

fixing crash due to make-child and make-root stepping on each other's toes

0.6.3-post-fixes
Dr Scofield 2009-02-13 16:11:52 +00:00
parent 1b4a615690
commit 6600a7a9bc
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
View File

@ -280,9 +280,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
{ {
m_log.DebugFormat("[Concierge]: {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName); m_log.DebugFormat("[Concierge]: {0} logs off from {1}", client.Name, client.Scene.RegionInfo.RegionName);
RemoveFromAttendeeList(client.AgentId, client.Name, client.Scene); RemoveFromAttendeeList(client.AgentId, client.Name, client.Scene);
AnnounceToAgentsRegion(client.Scene, String.Format(m_announceLeaving, client.Name, client.Scene.RegionInfo.RegionName, lock(m_sceneAttendees)
m_sceneAttendees[client.Scene].Count)); {
UpdateBroker(client.Scene); AnnounceToAgentsRegion(client.Scene, String.Format(m_announceLeaving, client.Name, client.Scene.RegionInfo.RegionName,
m_sceneAttendees[client.Scene].Count));
UpdateBroker(client.Scene);
m_attendeeNames.Remove(client.AgentId);
}
} }
} }
@ -348,7 +352,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
} }
attendees.Remove(agentID); attendees.Remove(agentID);
m_attendeeNames.Remove(agentID);
} }
} }
@ -386,10 +389,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
attendees.Count, scene.RegionInfo.RegionName, attendees.Count, scene.RegionInfo.RegionName,
scene.RegionInfo.RegionID, scene.RegionInfo.RegionID,
DateTime.UtcNow.ToString("s"))); DateTime.UtcNow.ToString("s")));
foreach (UUID uuid in attendees) lock(m_sceneAttendees)
{ {
string name = m_attendeeNames[uuid]; foreach (UUID uuid in attendees)
list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", name, uuid)); {
if (m_attendeeNames.ContainsKey(uuid))
{
string name = m_attendeeNames[uuid];
list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", name, uuid));
}
}
} }
list.Append("</avatars>"); list.Append("</avatars>");
} }