aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDr Scofield2009-05-18 15:32:06 +0000
committerDr Scofield2009-05-18 15:32:06 +0000
commite1a1d38aff6184e2fcaf9c6707c7efe7db835cfd (patch)
tree037faf49fff30f449b130920dd2109b81392820b /OpenSim/Region
parentRefactor: Change "Servers" to "Server", since the can only be one. Break (diff)
downloadopensim-SC_OLD-e1a1d38aff6184e2fcaf9c6707c7efe7db835cfd.zip
opensim-SC_OLD-e1a1d38aff6184e2fcaf9c6707c7efe7db835cfd.tar.gz
opensim-SC_OLD-e1a1d38aff6184e2fcaf9c6707c7efe7db835cfd.tar.bz2
opensim-SC_OLD-e1a1d38aff6184e2fcaf9c6707c7efe7db835cfd.tar.xz
From: Alan Webb <alan_webb> & Dr Scofield<drscofield@xyzzyxyzzy.net>
Disable use of log4net in script domains to avoid mono 2.4 aborts.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs40
2 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d4fc2d1..5b6f23a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
66 /// </summary> 66 /// </summary>
67 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi 67 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
68 { 68 {
69 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 69 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
70 protected IScriptEngine m_ScriptEngine; 70 protected IScriptEngine m_ScriptEngine;
71 protected SceneObjectPart m_host; 71 protected SceneObjectPart m_host;
72 protected uint m_localID; 72 protected uint m_localID;
@@ -8114,7 +8114,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8114 } 8114 }
8115 catch(Exception e) 8115 catch(Exception e)
8116 { 8116 {
8117 m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString()); 8117 //m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString());
8118 return UUID.Zero.ToString(); 8118 return UUID.Zero.ToString();
8119 } 8119 }
8120 } 8120 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 8e3d026..40c48d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
55{ 55{
56 public class ScriptInstance : IScriptInstance 56 public class ScriptInstance : IScriptInstance
57 { 57 {
58 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 58 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
59 59
60 private IScriptEngine m_Engine; 60 private IScriptEngine m_Engine;
61 private IScriptWorkItem m_CurrentResult = null; 61 private IScriptWorkItem m_CurrentResult = null;
@@ -268,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
268 } 268 }
269 catch (Exception e) 269 catch (Exception e)
270 { 270 {
271 m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); 271 // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly);
272 } 272 }
273 273
274 try 274 try
@@ -278,14 +278,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
278 m_Script.InitApi(kv.Key, kv.Value); 278 m_Script.InitApi(kv.Key, kv.Value);
279 } 279 }
280 280
281// m_log.Debug("[Script] Script instance created"); 281// // m_log.Debug("[Script] Script instance created");
282 282
283 part.SetScriptEvents(m_ItemID, 283 part.SetScriptEvents(m_ItemID,
284 (int)m_Script.GetStateEventFlags(State)); 284 (int)m_Script.GetStateEventFlags(State));
285 } 285 }
286 catch (Exception e) 286 catch (Exception e)
287 { 287 {
288 m_log.Error("[Script] Error loading script instance\n"+e.ToString()); 288 // m_log.Error("[Script] Error loading script instance\n"+e.ToString());
289 return; 289 return;
290 } 290 }
291 291
@@ -347,12 +347,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
347 } 347 }
348 else 348 else
349 { 349 {
350 m_log.Error("[Script] Unable to load script state: Memory limit exceeded"); 350 // m_log.Error("[Script] Unable to load script state: Memory limit exceeded");
351 } 351 }
352 } 352 }
353 catch (Exception e) 353 catch (Exception e)
354 { 354 {
355 m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml); 355 // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml);
356 } 356 }
357 } 357 }
358 else 358 else
@@ -362,7 +362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
362 if (presence != null && (!postOnRez)) 362 if (presence != null && (!postOnRez))
363 presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); 363 presence.ControllingClient.SendAgentAlertMessage("Compile successful", false);
364 364
365// m_log.ErrorFormat("[Script] Unable to load script state, file not found"); 365// // m_log.ErrorFormat("[Script] Unable to load script state, file not found");
366 } 366 }
367 } 367 }
368 368
@@ -454,10 +454,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
454 454
455 public void VarDump(Dictionary<string, object> vars) 455 public void VarDump(Dictionary<string, object> vars)
456 { 456 {
457 m_log.Info("Variable dump for script "+ m_ItemID.ToString()); 457 // m_log.Info("Variable dump for script "+ m_ItemID.ToString());
458 foreach (KeyValuePair<string, object> v in vars) 458 foreach (KeyValuePair<string, object> v in vars)
459 { 459 {
460 m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString()); 460 // m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString());
461 } 461 }
462 } 462 }
463 463
@@ -474,8 +474,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
474 { 474 {
475 if (m_CurrentResult == null) 475 if (m_CurrentResult == null)
476 m_CurrentResult = m_Engine.QueueEventHandler(this); 476 m_CurrentResult = m_Engine.QueueEventHandler(this);
477 else 477 // else
478 m_log.Error("[Script] Tried to start a script that was already queued"); 478 // m_log.Error("[Script] Tried to start a script that was already queued");
479 } 479 }
480 } 480 }
481 } 481 }
@@ -729,12 +729,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
729 } 729 }
730 catch (Exception e2) // LEGIT: User Scripting 730 catch (Exception e2) // LEGIT: User Scripting
731 { 731 {
732 m_log.Error("[SCRIPT]: "+ 732 // m_log.Error("[SCRIPT]: "+
733 "Error displaying error in-world: " + 733 // "Error displaying error in-world: " +
734 e2.ToString()); 734 // e2.ToString());
735 m_log.Error("[SCRIPT]: " + 735 // m_log.Error("[SCRIPT]: " +
736 "Errormessage: Error compiling script:\r\n" + 736 // "Errormessage: Error compiling script:\r\n" +
737 e.ToString()); 737 // e.ToString());
738 } 738 }
739 } 739 }
740 else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) 740 else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
@@ -892,7 +892,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
892 } 892 }
893 catch(Exception e) 893 catch(Exception e)
894 { 894 {
895 m_log.Error("Unable to save xml\n"+e.ToString()); 895 // m_log.Error("Unable to save xml\n"+e.ToString());
896 } 896 }
897 //if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), m_ItemID.ToString() + ".state"))) 897 //if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), m_ItemID.ToString() + ".state")))
898 //{ 898 //{
@@ -953,8 +953,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
953 } 953 }
954 } 954 }
955 955
956 m_log.ErrorFormat("Scripting exception:"); 956 // m_log.ErrorFormat("Scripting exception:");
957 m_log.ErrorFormat(e.ToString()); 957 // m_log.ErrorFormat(e.ToString());
958 958
959 return e.ToString(); 959 return e.ToString();
960 } 960 }