aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/UserAgentService.cs
diff options
context:
space:
mode:
authorBlueWall2011-12-05 15:29:00 -0500
committerBlueWall2011-12-05 15:29:00 -0500
commit2d3dda6db391d0b74459ba0b4d77e13078b76913 (patch)
treeb3391ff60a778b6809742cb0d1e53a67ece1b63c /OpenSim/Services/HypergridService/UserAgentService.cs
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-2d3dda6db391d0b74459ba0b4d77e13078b76913.zip
opensim-SC_OLD-2d3dda6db391d0b74459ba0b4d77e13078b76913.tar.gz
opensim-SC_OLD-2d3dda6db391d0b74459ba0b4d77e13078b76913.tar.bz2
opensim-SC_OLD-2d3dda6db391d0b74459ba0b4d77e13078b76913.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 1559cf3..cdc560c 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -281,7 +281,7 @@ namespace OpenSim.Services.HypergridService
281 } 281 }
282 282
283 // We need to prevent foreign users with the same UUID as a local user 283 // We need to prevent foreign users with the same UUID as a local user
284 public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName) 284 public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName)
285 { 285 {
286 if (!m_TravelingAgents.ContainsKey(sessionID)) 286 if (!m_TravelingAgents.ContainsKey(sessionID))
287 return false; 287 return false;