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

Merge branch 'master' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2011-12-05 17:10:51 +00:00
parent 3281b99362 a2d98c7293
commit 5ab536a1e9
27 changed files with 828 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,7 @@ namespace OpenSim.Services.HypergridService
}
// We need to prevent foreign users with the same UUID as a local user
public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName)
public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName)
{
if (!m_TravelingAgents.ContainsKey(sessionID))
return false;