10 files changed, 22 insertions, 24 deletions

diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index cf333af..d5b33f7 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Framework
                 AgentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID;
                 AgentCircuits[(uint) agentData.circuitcode].SessionID = agentData.SessionID;
 
-                // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
+                // m_log.Debug("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
             }
         }
 
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index d8fcf74..a6cec76 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -291,17 +291,17 @@ namespace OpenSim.Framework
                            + 0.07f * (float)m_visualparams[78] / 255.0f    // Shoe platform height
                            + 0.3836f * (float)m_visualparams[125] / 255.0f    // Leg length
                            - m_avatarHeight / 2) * 0.3f - 0.04f;
-            //System.Console.WriteLine(">>>>>>> [APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
-            //System.Console.WriteLine("------------- Set Appearance Texture ---------------");
+            //m_log.Debug(">>>>>>> [APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
+            //m_log.Debug("------------- Set Appearance Texture ---------------");
             //Primitive.TextureEntryFace[] faces = Texture.FaceTextures;
             //foreach (Primitive.TextureEntryFace face in faces)
             //{
             //    if (face != null)
-            //        System.Console.WriteLine("  ++ " + face.TextureID);
+            //        m_log.Debug("  ++ " + face.TextureID);
             //    else
-            //        System.Console.WriteLine("  ++ NULL ");
+            //        m_log.Debug("  ++ NULL ");
             //}
-            //System.Console.WriteLine("----------------------------");
+            //m_log.Debug("----------------------------");
 
         }
 
@@ -350,7 +350,7 @@ namespace OpenSim.Framework
 
             m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float));
 
-            //System.Console.WriteLine("AvatarAppearance Deserialize END");
+            //m_log.Debug("AvatarAppearance Deserialize END");
         }
 
         // this is used for OGS1
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 52f162e..1d015e5 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
 
         protected AvatarWearable(SerializationInfo info, StreamingContext context)
         {
-            //System.Console.WriteLine("AvatarWearable Deserialize BGN");
+            //m_log.Debug("AvatarWearable Deserialize BGN");
             if (info == null)
             {
                 throw new ArgumentNullException("info");
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
             AssetID = new UUID((Guid) info.GetValue("AssetID", typeof (Guid)));
             ItemID = new UUID((Guid) info.GetValue("ItemID", typeof (Guid)));
 
-            //System.Console.WriteLine("AvatarWearable Deserialize END");
+            //m_log.Debug("AvatarWearable Deserialize END");
         }
 
         public static AvatarWearable[] DefaultWearables
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 6752412..0060fef 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -576,10 +576,10 @@ namespace OpenSim.Framework
 
         public void Dump()
         {
-            System.Console.WriteLine("------------ AgentData ------------");
-            System.Console.WriteLine("UUID: " + AgentID);
-            System.Console.WriteLine("Region: " + RegionHandle);
-            System.Console.WriteLine("Position: " + Position);
+            m_log.Info("------------ AgentData ------------");
+            m_log.Info("UUID: " + AgentID);
+            m_log.Info("Region: " + RegionHandle);
+            m_log.Info("Position: " + Position);
         }
     }
   */
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0e1f948..2690e4e 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -510,11 +510,11 @@ namespace OpenSim.Framework.Communications.Cache
                 //inventory asset request
                 requestID = new UUID(transferRequest.TransferInfo.Params, 80);
                 source = 3;
-                //Console.WriteLine("asset request " + requestID);
+                //m_log.Debug("asset request " + requestID);
             }
 
             //check to see if asset is in local cache, if not we need to request it from asset server.
-            //Console.WriteLine("asset request " + requestID);
+            //m_log.Debug("asset request " + requestID);
             if (!m_memcache.Contains(requestID))
             {
                 //not found asset
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a4c847d..4ab304f 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -464,7 +464,7 @@ namespace OpenSim.Framework.Communications.Capabilities
         /// <returns></returns>
         public string RequestTexture(string request, string path, string param)
         {
-            System.Console.WriteLine("texture request " + request);
+            m_log.Debug("texture request " + request);
             // Needs implementing (added to remove compiler warning)
             return String.Empty;
         }
@@ -670,7 +670,7 @@ namespace OpenSim.Framework.Communications.Capabilities
                 }
             }
 
-            //System.Console.WriteLine("asset upload request via CAPS" + llsdRequest.inventory_type +" , "+ llsdRequest.asset_type);
+            //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type +" , "+ llsdRequest.asset_type);
 
             string assetName = llsdRequest.name;
             string assetDes = llsdRequest.description;
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 1f88062..588a39a 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Console
                 if (!dict.ContainsKey(helpPart))
                     break;
                 
-                //System.Console.WriteLine("Found {0}", helpParts[0]);
+                //m_log.Debug("Found {0}", helpParts[0]);
                 
                 if (dict[helpPart] is Dictionary<string, Object>)
                     dict = (Dictionary<string, object>)dict[helpPart]; 
diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs
index 803c712..c4d1318 100644
--- a/OpenSim/Framework/HGNetworkServersInfo.cs
+++ b/OpenSim/Framework/HGNetworkServersInfo.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
         {
             string userServerURI = ServerURI(userserver);
             bool ret = (((userServerURI == null) || (userServerURI == "") || (userServerURI == LocalUserServerURI)));
-            //Console.WriteLine("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
+            //m_log.Debug("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
             return ret;
         }
 
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index dcac9f1..2718072 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -700,8 +700,7 @@ namespace OpenSim.Framework
             }
             catch (Exception e)
             {
-                System.Console.WriteLine(e.Message);
-                System.Console.WriteLine(e.StackTrace);
+                m_log.Error(e.ToString());
             }
             finally
             {
@@ -728,8 +727,7 @@ namespace OpenSim.Framework
             }
             catch (Exception e)
             {
-                System.Console.WriteLine(e.Message);
-                System.Console.WriteLine(e.StackTrace);
+                m_log.Error(e.ToString());
             }
             finally
             {
diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs
index 7a4b4de..6675127 100644
--- a/OpenSim/Framework/WearableItem.cs
+++ b/OpenSim/Framework/WearableItem.cs
@@ -264,7 +264,7 @@ namespace OpenSim.Framework
             foreach (string line in lines)
             {
                 string trimLine = line.Trim();
-                // Console.WriteLine("line : " + trimLine);
+                // m_log.Debug("line : " + trimLine);
 
                 string[] splitLine = r.Split(trimLine);
                 if (splitLine.Length > 1)