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

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2011-06-11 12:08:02 +01:00
parent 326c46ba70 e07d71d298
commit a1c16a4200
23 changed files with 275 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/HypergridService/UserAgentService.cs
View File

@@ -197,9 +197,11 @@ namespace OpenSim.Services.HypergridService
agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
// restore the old travel info
if(reason != "Logins Disabled")
lock (m_TravelingAgents)
{
lock (m_TravelingAgents)
if (old == null)
m_TravelingAgents.Remove(agentCircuit.SessionID);
else
m_TravelingAgents[agentCircuit.SessionID] = old;
}