From baa29fcbff05c37a1a9192999bc55cee81cfe511 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 28 Oct 2008 15:46:30 +0000
Subject: * minor: Doc and log message tidy up * reinstate debug level log
 message indicating when a child agent is made a root for future debugging
 purposes

---
 .../Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs      |  5 ++---
 OpenSim/Region/Environment/Scenes/Scene.cs                   | 12 +++++++++---
 OpenSim/Region/Environment/Scenes/ScenePresence.cs           |  6 +++---
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 30e9f95..d3b782f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -57,15 +57,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
                 if (appearance != null)
                 {
                     //SetAppearanceAssets(profile, ref appearance);
-                    m_log.InfoFormat("[APPEARANCE] found : {0}", appearance.ToString());
+                    m_log.InfoFormat("[APPEARANCE]: Found : {0}", appearance.ToString());
                     return true;
                 }
             }
 
             appearance = CreateDefault(avatarId);
-            m_log.InfoFormat("[APPEARANCE] appearance not found for {0}, creating default", avatarId.ToString());
+            m_log.InfoFormat("[APPEARANCE]: Appearance not found for {0}, creating default", avatarId);
             return false;
-
         }
 
         private AvatarAppearance CreateDefault(UUID avatarId)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 0f96cf2..8d94c68 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2486,6 +2486,12 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        /// <summary>
+        /// Create a scene presence and add it to this scene.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="child"></param>
+        /// <returns></returns>
         protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
         {
             AvatarAppearance appearance = null;
@@ -2515,11 +2521,11 @@ namespace OpenSim.Region.Environment.Scenes
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[APPEARANCE]: Problem fetching appearance for avatar {0}, {1}, {2}",
-                    client.Name, client.AgentId, e.ToString());
+                m_log.ErrorFormat("[APPEARANCE]: Problem fetching appearance for avatar {0}, {1}",
+                    client.Name, e);
             }
+            
             m_log.Warn("[APPEARANCE]: Appearance not found, returning default");
-
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 3313524..ccc4be7 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -715,9 +715,9 @@ namespace OpenSim.Region.Environment.Scenes
                 ava.TryGetAvatarAppearance(m_uuid, out m_appearance);
             }
 
-//            m_log.DebugFormat(
-//                 "[SCENE PRESENCE]: Upgrading child agent {0}, {1} to a root agent in {2} at pos {3}",
-//                 Name, UUID, m_scene.RegionInfo.RegionName, pos);
+            m_log.DebugFormat(
+                "[SCENE]: Upgrading child to root agent for {0} in {1}",
+                Name, m_scene.RegionInfo.RegionName);
 
             if (pos.X < 0 || pos.X > Constants.RegionSize || pos.Y < 0 || pos.Y > Constants.RegionSize || pos.Z < 0)
             {
-- 
cgit v1.1