Merge branch 'master' into httptests

1 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 9bf3cf8..8e3cf0e 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -376,7 +376,8 @@ namespace OpenSim.Services.HypergridService
                 return false;
             }
 
-            if(account.PrincipalID == new UUID("6571e388-6218-4574-87db-f9379718315e"))
+            UUID agentID = aCircuit.AgentID;
+            if(agentID == new UUID("6571e388-6218-4574-87db-f9379718315e"))
             {
                 // really?
                 reason = "Invalid account ID";
@@ -385,21 +386,21 @@ namespace OpenSim.Services.HypergridService
 
             if(m_GridUserService != null)
             {
-                string PrincipalIDstr = account.PrincipalID.ToString();
+                string PrincipalIDstr = agentID.ToString();
                 GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(PrincipalIDstr);
 
                 if(!m_allowDuplicatePresences)
                 {
                     if(guinfo != null && guinfo.Online && guinfo.LastRegionID != UUID.Zero)
                     {
-                        if(SendAgentGodKillToRegion(UUID.Zero, account.PrincipalID, guinfo))
+                        if(SendAgentGodKillToRegion(UUID.Zero, agentID, guinfo))
                         {
                             m_log.InfoFormat(
                                 "[GATEKEEPER SERVICE]: Login failed for {0} {1}, reason: already logged in",
                                 account.FirstName, account.LastName);
-                            reason = "You appear to be already logged in on destiny grid " +
+                            reason = "You appear to be already logged in on the destination grid " +
                                     "Please wait a a minute or two and retry. " +
-                                    "If this takes longer than a few minutes please contact the grid owner. ";
+                                    "If this takes longer than a few minutes please contact the grid owner.";
                             return false;
                         }
                     }