aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-14 19:53:15 +0000
committerJustin Clarke Casey2009-01-14 19:53:15 +0000
commit8a08e4980d4416bef4cbd2e763eaf1052e5e40cd (patch)
tree6cf853b47acb7ca04b6e176266217558a3389981 /OpenSim/Region/Environment/Scenes
parent* Added MySQL Grid unit tests (diff)
downloadopensim-SC_OLD-8a08e4980d4416bef4cbd2e763eaf1052e5e40cd.zip
opensim-SC_OLD-8a08e4980d4416bef4cbd2e763eaf1052e5e40cd.tar.gz
opensim-SC_OLD-8a08e4980d4416bef4cbd2e763eaf1052e5e40cd.tar.bz2
opensim-SC_OLD-8a08e4980d4416bef4cbd2e763eaf1052e5e40cd.tar.xz
* 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)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs42
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
2759 /// <param name="agent"></param> 2759 /// <param name="agent"></param>
2760 public void NewUserConnection(AgentCircuitData agent) 2760 public void NewUserConnection(AgentCircuitData agent)
2761 { 2761 {
2762 // Don't disable this log message - it's too helpful
2763 m_log.DebugFormat(
2764 "[CONNECTION BEGIN]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})",
2765 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
2766
2767 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
2768 {
2769 m_log.WarnFormat(
2770 "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist",
2771 agent.AgentID, RegionInfo.RegionName);
2772 }
2773
2774 /// Diva: Horrible stuff! 2762 /// Diva: Horrible stuff!
2775 capsPaths[agent.AgentID] = agent.CapsPath; 2763 capsPaths[agent.AgentID] = agent.CapsPath;
2776 childrenSeeds[agent.AgentID] = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds); 2764 childrenSeeds[agent.AgentID] = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds);
2777 2765
2778 ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID); 2766 ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
2779 if (sp != null) 2767 if (sp != null)
2780 { 2768 {
2781 if (sp.IsChildAgent) 2769 m_log.DebugFormat(
2782 m_log.DebugFormat( 2770 "[SCENE]: Adjusting known seeds for existing agent {0} in {1}",
2783 "[CONNECTION BEGIN]: Incoming client for {0} is existing child agent {1}", 2771 agent.AgentID, RegionInfo.RegionName);
2784 RegionInfo.RegionName, agent.AgentID);
2785 else
2786 m_log.DebugFormat(
2787 "[CONNECTION BEGIN]: Incoming client for {0} is existing root agent {1}",
2788 RegionInfo.RegionName, agent.AgentID);
2789
2790// m_log.DebugFormat(
2791// "[CONNECTION BEGIN]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName);
2792 2772
2793 sp.AdjustKnownSeeds(); 2773 sp.AdjustKnownSeeds();
2794 2774
2795 return; 2775 return;
2796 } 2776 }
2797 2777
2778 // Don't disable this log message - it's too helpful
2779 m_log.DebugFormat(
2780 "[CONNECTION BEGIN]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})",
2781 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
2782
2783 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
2784 {
2785 m_log.WarnFormat(
2786 "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist",
2787 agent.AgentID, RegionInfo.RegionName);
2788 }
2789
2798 AddCapsHandler(agent.AgentID); 2790 AddCapsHandler(agent.AgentID);
2799 2791
2800 if (!agent.child) 2792 if (!agent.child)