* minor: log message twiddling

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
         protected internal void AddScenePresence(ScenePresence presence)
         {
             bool child = presence.IsChildAgent;
-
+            
             if (child)
             {
                 m_numChildAgents++;
-                m_log.Info("[SCENE]" + m_regInfo.RegionName + ": Creating new child agent.");
             }
             else
             {
                 m_numRootAgents++;
-                m_log.Info("[SCENE] " + m_regInfo.RegionName + ": Creating new root agent.");
-                m_log.Info("[SCENE] " + m_regInfo.RegionName + ": Adding Physical agent.");
-
                 presence.AddToPhysicalScene();
             }
 
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
         /// <param name="child"></param>
         public override void AddNewClient(IClientAPI client, bool child)
         {
-            m_log.DebugFormat(
-                "[CONNECTION DEBUGGING]: Creating new client for {0} at {1}",
-                client.AgentId, RegionInfo.RegionName);
-
             SubscribeToClientEvents(client);
             ScenePresence presence;
 
             if (m_restorePresences.ContainsKey(client.AgentId))
             {
-                m_log.Info("[REGION]: Restoring Scene Presence");
+                m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
 
                 presence = m_restorePresences[client.AgentId];
                 m_restorePresences.Remove(client.AgentId);
@@ -2015,7 +2011,9 @@ namespace OpenSim.Region.Environment.Scenes
             }
             else
             {
-                m_log.Info("[REGION]: Adding New Scene Presence");
+                m_log.DebugFormat(
+                    "[SCENE]: Adding new {0} agent {1} {2} in {3}", 
+                    (child ? "child" : "root"), client.Name, client.AgentId, RegionInfo.RegionName);
 
                 CommsManager.UserProfileCacheService.AddNewUser(client);
 
@@ -2263,6 +2261,10 @@ namespace OpenSim.Region.Environment.Scenes
             }
             try
             {
+                m_log.DebugFormat(
+                    "[SCENE]: Removing {0} agent {1} from region {2}", 
+                    (childagentYN ? "child" : "root"), agentID, RegionInfo.RegionName);
+                
                 if (avatar.IsChildAgent)
                 {
                     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
             m_animations.Clear();
 
 //            m_log.DebugFormat(
-//                 "[SCENEPRESENCE]: Downgrading child agent {0}, {1} to a root agent in {2}",
+//                 "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
 //                 Name, UUID, m_scene.RegionInfo.RegionName);
 
             Velocity = new LLVector3(0, 0, 0);