2 files changed, 0 insertions, 31 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index a8eae56..bc6a97d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -143,11 +143,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 asset.Data);
 
             m_assetsWritten++;
-
-            //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten);
-
-            if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0)
-                m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten);
         }
 
     }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 9232db9..3b94dff 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -181,17 +181,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             AvatarAppearance npcAppearance = new AvatarAppearance(appearance, true);
             acd.Appearance = npcAppearance;
 
-            /*
-            for (int i = 0;
-                    i < acd.Appearance.Texture.FaceTextures.Length; i++)
-            {
-                m_log.DebugFormat(
-                        "[NPC MODULE]: NPC avatar {0} has texture id {1} : {2}",
-                        acd.AgentID, i,
-                        acd.Appearance.Texture.FaceTextures[i]);
-            }
-            */
-
             lock (m_avatars)
             {
                 scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode,
@@ -201,12 +190,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                 ScenePresence sp;
                 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
                 {
-                    /*
-                    m_log.DebugFormat(
-                            "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}",
-                            sp.Name, sp.UUID);
-                    */
-
                     sp.CompleteMovement(npcAvatar, false);
                     m_avatars.Add(npcAvatar.AgentId, npcAvatar);
                     m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
@@ -237,11 +220,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                         if (sp.IsSatOnObject || sp.SitGround)
                             return false;
 
-//                        m_log.DebugFormat(
-//                                "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}",
-//                                sp.Name, pos, scene.RegionInfo.RegionName,
-//                                noFly, landAtTarget);
-
                         sp.MoveToTarget(pos, noFly, landAtTarget);
                         sp.SetAlwaysRun = running;
 
@@ -404,10 +382,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             {
                 if (m_avatars.TryGetValue(agentID, out av))
                 {
-                    /*
-                    m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove",
-                            agentID, av.Name);
-                    */
                     doRemove = true;
                 }
             }