4 files changed, 9 insertions, 11 deletions

diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index cdccf0e..6ea12c1 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -71,12 +71,10 @@ namespace OpenSim.Framework
 
         public void Remove(uint id)
         {
-            //m_log.InfoFormat("[CLIENT]: Removing client with code {0}, current count {1}", id, m_clients.Count);
             lock (m_clients)
             {
                 m_clients.Remove(id);
             }
-            m_log.InfoFormat("[CLIENT]: Removed client with code {0}, new client count {1}", id, m_clients.Count);
         }
 
         public void Add(uint id, IClientAPI client)
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 0cbb717..22aab10 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Communications.Cache
             if (userID == UUID.Zero)
                 return;
             
-            m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
+            //m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
             GetUserDetails(userID);
         }
 
@@ -95,7 +95,6 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 if (m_userProfiles.ContainsKey(userId))
                 {
-                    m_log.DebugFormat("[USER CACHE]: Removing user {0}", userId);
                     m_userProfiles.Remove(userId);
                     return true;
                 }
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 91acfbe..6adf68c 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -157,7 +157,9 @@ namespace OpenSim.Framework.Communications.Capabilities
             {
                 // the root of all evil
                 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);
-                m_log.Warn("[SEED]: " + capsBase + m_requestPath); 
+                m_log.DebugFormat(
+                    "[CAPS]: Registering seed capability {0} for {1}", capsBase + m_requestPath, m_agentID);
+                
                 //m_capsHandlers["MapLayer"] =
                 //    new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
                 //                                                                capsBase + m_mapLayerPath,
@@ -209,7 +211,7 @@ namespace OpenSim.Framework.Communications.Capabilities
         public void RegisterHandler(string capName, IRequestHandler handler)
         {
             m_capsHandlers[capName] = handler;
-            m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
+            //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
         }
 
         /// <summary>
@@ -242,10 +244,12 @@ namespace OpenSim.Framework.Communications.Capabilities
         public string CapsRequest(string request, string path, string param,
                                   OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
-            m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
-            //Console.WriteLine("caps request " + request);
+            //m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
+
             string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails);
+            
             //m_log.DebugFormat("[CAPS] CapsRequest {0}", result);
+            
             return result;
         }
 
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 3f2b902..2e3efd5 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -547,9 +547,6 @@ namespace OpenSim.Framework.Communications
 
             if (userProfile != null)
             {
-                // This line needs to be in side the above if statement or the UserServer will crash on some logouts.
-                m_log.Info("[LOGOUT]: " + userProfile.FirstName + " " + userProfile.SurName + " from " + regionhandle + "(" + position.X + "," + position.Y + "," + position.Z + ")");
-
                 UserAgentData userAgent = userProfile.CurrentAgent;
                 if (userAgent != null)
                 {