aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs23
1 files changed, 17 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 11655e9..4ff4c0e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2759,15 +2759,15 @@ 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 messages - it's too useful 2762 // Don't disable this log message - it's too helpful
2763 m_log.DebugFormat( 2763 m_log.DebugFormat(
2764 "[CONNECTION SETUP]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})", 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); 2765 RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode);
2766 2766
2767 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) 2767 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
2768 { 2768 {
2769 m_log.WarnFormat( 2769 m_log.WarnFormat(
2770 "[CONNECTION SETUP]: Denied access to: {0} at {1} because the user is on the region banlist", 2770 "[CONNECTION BEGIN]: Denied access to: {0} at {1} because the user is on the region banlist",
2771 agent.AgentID, RegionInfo.RegionName); 2771 agent.AgentID, RegionInfo.RegionName);
2772 } 2772 }
2773 2773
@@ -2778,11 +2778,22 @@ namespace OpenSim.Region.Environment.Scenes
2778 ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID); 2778 ScenePresence sp = m_sceneGraph.GetScenePresence(agent.AgentID);
2779 if (sp != null) 2779 if (sp != null)
2780 { 2780 {
2781 m_log.DebugFormat( 2781 if (sp.IsChildAgent)
2782 "[CONNECTION SETUP]: Updated existing agent {0} in {1}", agent.AgentID, RegionInfo.RegionName); 2782 m_log.DebugFormat(
2783 "[CONNECTION BEGIN]: Incoming client for {0} is existing child agent {1}",
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
2783 sp.AdjustKnownSeeds(); 2793 sp.AdjustKnownSeeds();
2784 sp.AbsolutePosition = agent.startpos; 2794 sp.AbsolutePosition = agent.startpos;
2785 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); 2795 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
2796
2786 return; 2797 return;
2787 } 2798 }
2788 2799
@@ -2813,7 +2824,7 @@ namespace OpenSim.Region.Environment.Scenes
2813 else 2824 else
2814 { 2825 {
2815 m_log.WarnFormat( 2826 m_log.WarnFormat(
2816 "[CONNECTION SETUP]: We couldn't find a User Info record for {0}. This is usually an indication that the UUID we're looking up is invalid", agent.AgentID); 2827 "[CONNECTION BEGIN]: We couldn't find a User Info record for {0}. This is usually an indication that the UUID we're looking up is invalid", agent.AgentID);
2817 } 2828 }
2818 } 2829 }
2819 2830