From 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Sun, 22 Feb 2009 20:52:55 +0000
Subject: Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that: *
 Added log4net dependency to physxplugin in prebuild.xml. * Added missing
 m_log fields to classes. * Replaced Console.WriteLine with appropriate
 m_log.Xxxx * Tested that nant test target runs succesfully. * Tested that
 local opensim sandbox starts up without errors.

---
 .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs      | 14 ++++++++------
 .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs     |  2 +-
 .../Shared/Api/Implementation/Plugins/HttpRequest.cs       |  2 +-
 .../Shared/Api/Implementation/Plugins/Timer.cs             |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5455b53..bc113db 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -58,6 +58,7 @@ using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
 using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
 using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
 using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
+using System.Reflection;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
@@ -66,6 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     /// </summary>
     public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         protected IScriptEngine m_ScriptEngine;
         protected SceneObjectPart m_host;
         protected uint m_localID;
@@ -1135,7 +1137,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llGetStatus(int status)
         {
             m_host.AddScriptLPS(1);
-            // Console.WriteLine(m_host.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString());
+            // m_log.Debug(m_host.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString());
             switch (status)
             {
                 case ScriptBaseClass.STATUS_PHYSICS:
@@ -2706,8 +2708,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
             msg.toAgentID = new Guid(user); // toAgentID.Guid;
             msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
-//            Console.WriteLine("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
-//            Console.WriteLine("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
+//            m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
+//            m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
             msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp;
             //if (client != null)
             //{
@@ -7882,7 +7884,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             catch(Exception e)
             {
-                Console.WriteLine("[LSL_API]: llRequestSimulatorData" + e.ToString());
+                m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString());
                 return UUID.Zero.ToString();
             }
         }
@@ -9068,7 +9070,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         System.Text.ASCIIEncoding enc =
                             new System.Text.ASCIIEncoding();
                         string data = enc.GetString(a.Data);
-                        //Console.WriteLine(data);
+                        //m_log.Debug(data);
                         NotecardCache.Cache(id, data);
                         AsyncCommands.
                                 DataserverPlugin.DataserverReply(id.ToString(),
@@ -9114,7 +9116,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         System.Text.ASCIIEncoding enc =
                             new System.Text.ASCIIEncoding();
                         string data = enc.GetString(a.Data);
-                        //Console.WriteLine(data);
+                        //m_log.Debug(data);
                         NotecardCache.Cache(id, data);
                         AsyncCommands.
                                 DataserverPlugin.DataserverReply(id.ToString(),
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 597592d..7834a83 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -842,7 +842,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 for (i=0;i<JSON.Length; i++)
                 {
 
-                    // Console.WriteLine(""+JSON[i]);
+                    // m_log.Debug(""+JSON[i]);
                     switch (JSON[i])
                     {
                         case '{':
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
index 0654c07..2ed9295 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             while (httpInfo != null)
             {
-                //System.Console.WriteLine("[AsyncLSL]:" + httpInfo.response_body + httpInfo.status);
+                //m_log.Debug("[AsyncLSL]:" + httpInfo.response_body + httpInfo.status);
 
                 // Deliver data to prim's remote_data handler
                 //
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 91cef9b..d08790c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                     // Time has passed?
                     if (ts.next < DateTime.Now.Ticks)
                     {
-                        //Console.WriteLine("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
+                        //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
                         // Add it to queue
                         m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
                                 new EventParams("timer", new Object[0],
-- 
cgit v1.1