1 files changed, 17 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4f674a3..8fe2d72 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3699,14 +3699,21 @@ namespace OpenSim.Region.Framework.Scenes
                     sp.ControllingClient.Close(true);
                     sp = null;
                 }
-    
+
+                // Optimistic: add or update the circuit data with the new agent circuit data and teleport flags.
+                // We need the circuit data here for some of the subsequent checks. (groups, for example)
+                // If the checks fail, we remove the circuit.
+                agent.teleportFlags = teleportFlags;
+                m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+
                 land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
     
-                //On login test land permisions
+                // On login test land permisions
                 if (vialogin)
                 {
                     if (land != null && !TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y))
                     {
+                        m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                         return false;
                     }
                 }
@@ -3718,13 +3725,17 @@ namespace OpenSim.Region.Framework.Scenes
                         try
                         {
                             if (!VerifyUserPresence(agent, out reason))
+                            {
+                                m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                                 return false;
+                            }
                         }
                         catch (Exception e)
                         {
                             m_log.ErrorFormat(
                                 "[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
 
+                            m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                             return false;
                         }
                     }
@@ -3732,13 +3743,17 @@ namespace OpenSim.Region.Framework.Scenes
                     try
                     {
                         if (!AuthorizeUser(agent, out reason))
+                        {
+                            m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                             return false;
+                        }
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
                             "[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
 
+                        m_authenticateHandler.RemoveCircuit(agent.circuitcode);
                         return false;
                     }
     
@@ -3773,9 +3788,6 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            // In all cases, add or update the circuit data with the new agent circuit data and teleport flags
-            agent.teleportFlags = teleportFlags;
-            m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
 
             if (vialogin)
             {