diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
3 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 359b6f3..8b395a2 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -555,18 +555,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
555 | protected internal void AddScenePresence(ScenePresence presence) | 555 | protected internal void AddScenePresence(ScenePresence presence) |
556 | { | 556 | { |
557 | bool child = presence.IsChildAgent; | 557 | bool child = presence.IsChildAgent; |
558 | 558 | ||
559 | if (child) | 559 | if (child) |
560 | { | 560 | { |
561 | m_numChildAgents++; | 561 | m_numChildAgents++; |
562 | m_log.Info("[SCENE]" + m_regInfo.RegionName + ": Creating new child agent."); | ||
563 | } | 562 | } |
564 | else | 563 | else |
565 | { | 564 | { |
566 | m_numRootAgents++; | 565 | m_numRootAgents++; |
567 | m_log.Info("[SCENE] " + m_regInfo.RegionName + ": Creating new root agent."); | ||
568 | m_log.Info("[SCENE] " + m_regInfo.RegionName + ": Adding Physical agent."); | ||
569 | |||
570 | presence.AddToPhysicalScene(); | 566 | presence.AddToPhysicalScene(); |
571 | } | 567 | } |
572 | 568 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f81248b..33b2f6f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1982,16 +1982,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1982 | /// <param name="child"></param> | 1982 | /// <param name="child"></param> |
1983 | public override void AddNewClient(IClientAPI client, bool child) | 1983 | public override void AddNewClient(IClientAPI client, bool child) |
1984 | { | 1984 | { |
1985 | m_log.DebugFormat( | ||
1986 | "[CONNECTION DEBUGGING]: Creating new client for {0} at {1}", | ||
1987 | client.AgentId, RegionInfo.RegionName); | ||
1988 | |||
1989 | SubscribeToClientEvents(client); | 1985 | SubscribeToClientEvents(client); |
1990 | ScenePresence presence; | 1986 | ScenePresence presence; |
1991 | 1987 | ||
1992 | if (m_restorePresences.ContainsKey(client.AgentId)) | 1988 | if (m_restorePresences.ContainsKey(client.AgentId)) |
1993 | { | 1989 | { |
1994 | m_log.Info("[REGION]: Restoring Scene Presence"); | 1990 | m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName); |
1995 | 1991 | ||
1996 | presence = m_restorePresences[client.AgentId]; | 1992 | presence = m_restorePresences[client.AgentId]; |
1997 | m_restorePresences.Remove(client.AgentId); | 1993 | m_restorePresences.Remove(client.AgentId); |
@@ -2015,7 +2011,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2015 | } | 2011 | } |
2016 | else | 2012 | else |
2017 | { | 2013 | { |
2018 | m_log.Info("[REGION]: Adding New Scene Presence"); | 2014 | m_log.DebugFormat( |
2015 | "[SCENE]: Adding new {0} agent {1} {2} in {3}", | ||
2016 | (child ? "child" : "root"), client.Name, client.AgentId, RegionInfo.RegionName); | ||
2019 | 2017 | ||
2020 | CommsManager.UserProfileCacheService.AddNewUser(client); | 2018 | CommsManager.UserProfileCacheService.AddNewUser(client); |
2021 | 2019 | ||
@@ -2263,6 +2261,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
2263 | } | 2261 | } |
2264 | try | 2262 | try |
2265 | { | 2263 | { |
2264 | m_log.DebugFormat( | ||
2265 | "[SCENE]: Removing {0} agent {1} from region {2}", | ||
2266 | (childagentYN ? "child" : "root"), agentID, RegionInfo.RegionName); | ||
2267 | |||
2266 | if (avatar.IsChildAgent) | 2268 | if (avatar.IsChildAgent) |
2267 | { | 2269 | { |
2268 | m_innerScene.removeUserCount(false); | 2270 | m_innerScene.removeUserCount(false); |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 178d652..626a71c 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -654,7 +654,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
654 | m_animations.Clear(); | 654 | m_animations.Clear(); |
655 | 655 | ||
656 | // m_log.DebugFormat( | 656 | // m_log.DebugFormat( |
657 | // "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}", | 657 | // "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", |
658 | // Name, UUID, m_scene.RegionInfo.RegionName); | 658 | // Name, UUID, m_scene.RegionInfo.RegionName); |
659 | 659 | ||
660 | Velocity = new LLVector3(0, 0, 0); | 660 | Velocity = new LLVector3(0, 0, 0); |