* Adjust log messages so that we don't get a CONNECTION BEGIN for notifications that won't actually lead to a client connection (because they are from a neighbouring teleport

target that needs to trigger a child seeds adjustment on a child agent that has been kept around)

1 files changed, 17 insertions, 25 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 806b5b5..94ca07c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2759,42 +2759,34 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="agent"></param>
         public void NewUserConnection(AgentCircuitData agent)
         {
-            // Don't disable this log message - it's too helpful
-            m_log.DebugFormat(
-                "[CONNECTION BEGIN]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})", 
-                RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
-            
-            if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
-            {
-                m_log.WarnFormat(
-               "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist",
-               agent.AgentID, RegionInfo.RegionName);
-            }
-
             /// Diva: Horrible stuff!
             capsPaths[agent.AgentID] = agent.CapsPath;
             childrenSeeds[agent.AgentID] = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds);
 
             ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
             if (sp != null)
-            {
-                if (sp.IsChildAgent)
-                    m_log.DebugFormat(
-                        "[CONNECTION BEGIN]: Incoming client for {0} is existing child agent {1}", 
-                        RegionInfo.RegionName, agent.AgentID);
-                else
-                    m_log.DebugFormat(
-                        "[CONNECTION BEGIN]: Incoming client for {0} is existing root agent {1}", 
-                        RegionInfo.RegionName, agent.AgentID);
-                    
-//                m_log.DebugFormat(
-//                    "[CONNECTION BEGIN]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
+            {                    
+                m_log.DebugFormat(
+                    "[SCENE]: Adjusting known seeds for existing agent {0} in {1}", 
+                    agent.AgentID, RegionInfo.RegionName);
                 
                 sp.AdjustKnownSeeds();
                 
                 return;
             }
-
+            
+            // Don't disable this log message - it's too helpful
+            m_log.DebugFormat(
+                "[CONNECTION BEGIN]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})", 
+                RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
+            
+            if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
+            {
+                m_log.WarnFormat(
+               "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist",
+               agent.AgentID, RegionInfo.RegionName);
+            }
+            
             AddCapsHandler(agent.AgentID);
 
             if (!agent.child)