aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ExtensionsScriptModule
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ExtensionsScriptModule')
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs5
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs5
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs6
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs7
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs5
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs5
6 files changed, 20 insertions, 13 deletions
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
index deb289f..43049fc 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
@@ -28,14 +28,15 @@
28using System; 28using System;
29using System.CodeDom.Compiler; 29using System.CodeDom.Compiler;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using log4net;
31using Microsoft.CSharp; 33using Microsoft.CSharp;
32using OpenSim.Framework.Console;
33 34
34namespace OpenSim.Region.ExtensionsScriptModule.CSharp 35namespace OpenSim.Region.ExtensionsScriptModule.CSharp
35{ 36{
36 public class CSharpScriptEngine : IScriptCompiler 37 public class CSharpScriptEngine : IScriptCompiler
37 { 38 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 40
40 public string FileExt() 41 public string FileExt()
41 { 42 {
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
index f5689cb..52afe3f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
@@ -28,14 +28,15 @@
28using System; 28using System;
29using System.CodeDom.Compiler; 29using System.CodeDom.Compiler;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using log4net;
31using Microsoft.JScript; 33using Microsoft.JScript;
32using OpenSim.Framework.Console;
33 34
34namespace OpenSim.Region.ExtensionsScriptModule.JScript 35namespace OpenSim.Region.ExtensionsScriptModule.JScript
35{ 36{
36 public class JScriptEngine : IScriptCompiler 37 public class JScriptEngine : IScriptCompiler
37 { 38 {
38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 40
40 public string FileExt() 41 public string FileExt()
41 { 42 {
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
index 16c6e79..efd01e9 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
@@ -25,6 +25,8 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29
28namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM 30namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
29{ 31{
30 partial class Thread 32 partial class Thread
@@ -46,8 +48,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
46 string typ = 48 string typ =
47 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]). 49 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]).
48 mNameType.Type.Value; 50 mNameType.Type.Value;
49 string typeparam = System.String.Empty; 51 string typeparam = String.Empty;
50 string typereturn = System.String.Empty; 52 string typereturn = String.Empty;
51 int firstbrak = 0; 53 int firstbrak = 0;
52 int secondbrak = 0; 54 int secondbrak = 0;
53 firstbrak = typ.LastIndexOf('('); 55 firstbrak = typ.LastIndexOf('(');
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
index 428192f..16c449f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
@@ -25,8 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Reflection;
28using libsecondlife; 29using libsecondlife;
29using OpenSim.Framework.Console; 30using log4net;
30using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
31 32
32namespace OpenSim.Region.ExtensionsScriptModule 33namespace OpenSim.Region.ExtensionsScriptModule
@@ -36,7 +37,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
36 /// </summary> 37 /// </summary>
37 public class ScriptInfo 38 public class ScriptInfo
38 { 39 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 41
41 // Reference to world.eventsManager provided for convenience 42 // Reference to world.eventsManager provided for convenience
42 public EventManager events; 43 public EventManager events;
@@ -47,7 +48,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
47 // API Access 48 // API Access
48 public ScriptAPI api; 49 public ScriptAPI api;
49 50
50 public log4net.ILog Log 51 public ILog Log
51 { 52 {
52 get { return m_log; } 53 get { return m_log; }
53 } 54 }
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
index d0a0e86..a11fb0f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
@@ -26,9 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Reflection;
29using System.Text; 30using System.Text;
30using Axiom.Math; 31using Axiom.Math;
31using OpenSim.Framework.Console; 32using log4net;
32using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Environment.Interfaces;
33using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
34using Key = libsecondlife.LLUUID; 35using Key = libsecondlife.LLUUID;
@@ -44,7 +45,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
44 /// <remarks>Avoid at all costs. This should ONLY be used for LSL.</remarks> 45 /// <remarks>Avoid at all costs. This should ONLY be used for LSL.</remarks>
45 internal class ScriptInterpretedAPI 46 internal class ScriptInterpretedAPI
46 { 47 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 49
49 protected Key m_object; 50 protected Key m_object;
50 protected Scene m_scene; 51 protected Scene m_scene;
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index 9edc6dc..8c11f7a 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -26,8 +26,9 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using log4net;
29using Nini.Config; 31using Nini.Config;
30using OpenSim.Framework.Console;
31using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.ExtensionsScriptModule.CSharp; 34using OpenSim.Region.ExtensionsScriptModule.CSharp;
@@ -38,7 +39,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
38{ 39{
39 public class ScriptManager : IRegionModule, IExtensionScriptModule 40 public class ScriptManager : IRegionModule, IExtensionScriptModule
40 { 41 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 43
43 private readonly List<IScript> scripts = new List<IScript>(); 44 private readonly List<IScript> scripts = new List<IScript>();
44 private Scene m_scene; 45 private Scene m_scene;