diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 9c3aa96..8a9d295 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2777,7 +2777,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2777 | 2777 | ||
2778 | // Don't disable this log message - it's too helpful | 2778 | // Don't disable this log message - it's too helpful |
2779 | m_log.DebugFormat( | 2779 | m_log.DebugFormat( |
2780 | "[CONNECTION BEGIN]: Scene {0} told of incoming client {1} {2} {3} (circuit code {4})", | 2780 | "[CONNECTION BEGIN]: Region {0} told of incoming client {1} {2} {3} (circuit code {4})", |
2781 | RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode); | 2781 | RegionInfo.RegionName, agent.firstname, agent.lastname, agent.AgentID, agent.circuitcode); |
2782 | 2782 | ||
2783 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) | 2783 | if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) |
@@ -2977,13 +2977,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
2977 | 2977 | ||
2978 | public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) | 2978 | public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) |
2979 | { | 2979 | { |
2980 | //Console.WriteLine(" XXX Scene IncomingChildAgentDataUpdate FULL in " + RegionInfo.RegionName); | 2980 | // m_log.DebugFormat( |
2981 | // "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); | ||
2982 | |||
2981 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); | 2983 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); |
2982 | if (childAgentUpdate != null) | 2984 | if (childAgentUpdate != null) |
2983 | { | 2985 | { |
2984 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); | 2986 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); |
2985 | return true; | 2987 | return true; |
2986 | } | 2988 | } |
2989 | |||
2987 | return false; | 2990 | return false; |
2988 | } | 2991 | } |
2989 | 2992 | ||
@@ -3030,6 +3033,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
3030 | /// <param name="agentID"></param> | 3033 | /// <param name="agentID"></param> |
3031 | public bool IncomingCloseAgent(UUID agentID) | 3034 | public bool IncomingCloseAgent(UUID agentID) |
3032 | { | 3035 | { |
3036 | //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID); | ||
3037 | |||
3033 | ScenePresence presence = m_sceneGraph.GetScenePresence(agentID); | 3038 | ScenePresence presence = m_sceneGraph.GetScenePresence(agentID); |
3034 | if (presence != null) | 3039 | if (presence != null) |
3035 | { | 3040 | { |
@@ -3056,9 +3061,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
3056 | else | 3061 | else |
3057 | presence.ControllingClient.SendShutdownConnectionNotice(); | 3062 | presence.ControllingClient.SendShutdownConnectionNotice(); |
3058 | } | 3063 | } |
3064 | |||
3059 | presence.ControllingClient.Close(true); | 3065 | presence.ControllingClient.Close(true); |
3060 | return true; | 3066 | return true; |
3061 | } | 3067 | } |
3068 | |||
3062 | // Agent not here | 3069 | // Agent not here |
3063 | return false; | 3070 | return false; |
3064 | } | 3071 | } |