1 files changed, 107 insertions, 107 deletions
diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index 7a08735..27e831b 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -1,107 +1,107 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenSim.Framework.Console;
+using OpenSim.Framework.Console;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Scripting
-{
+{
-    public class ScriptManager
+    public class ScriptManager
-    {
+    {
-        List<IScript> scripts = new List<IScript>();
+        List<IScript> scripts = new List<IScript>();
-        Scene scene;
+        Scene scene;
-        Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();
+        Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();
-        private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)
+        private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)
-        {
+        {
-            foreach (KeyValuePair<string, IScript> script in compiledscripts)
+            foreach (KeyValuePair<string, IScript> script in compiledscripts)
-            {
+            {
-                ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
+                ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
-                MainLog.Instance.Verbose("Loading " + script.Key);
+                MainLog.Instance.Verbose("Loading " + script.Key);
-                script.Value.Initialise(scriptInfo);
+                script.Value.Initialise(scriptInfo);
-                scripts.Add(script.Value);
+                scripts.Add(script.Value);
-            }
+            }
-            MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
+            MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
-        }
+        }
-        public ScriptManager(Scene world)
+        public ScriptManager(Scene world)
-        {
+        {
-            scene = world;
+            scene = world;
-            // Default Engines
+            // Default Engines
-            CSharpScriptEngine csharpCompiler = new CSharpScriptEngine();
+            CSharpScriptEngine csharpCompiler = new CSharpScriptEngine();
-            compilers.Add(csharpCompiler.FileExt(),csharpCompiler);
+            compilers.Add(csharpCompiler.FileExt(),csharpCompiler);
-            JScriptEngine jscriptCompiler = new JScriptEngine();
+            JScriptEngine jscriptCompiler = new JScriptEngine();
-            compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
+            compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
-            JavaEngine javaCompiler = new JavaEngine();
+            JavaEngine javaCompiler = new JavaEngine();
-            compilers.Add(javaCompiler.FileExt(), javaCompiler);
+            compilers.Add(javaCompiler.FileExt(), javaCompiler);
-        }
+        }
-        public void Compile(string filename)
+        public void Compile(string filename)
-        {
+        {
-            foreach (KeyValuePair<string, IScriptCompiler> compiler in compilers)
+            foreach (KeyValuePair<string, IScriptCompiler> compiler in compilers)
-            {
+            {
-                if (filename.EndsWith(compiler.Key))
+                if (filename.EndsWith(compiler.Key))
-                {
+                {
-                    LoadFromCompiler(compiler.Value.compile(filename));
+                    LoadFromCompiler(compiler.Value.compile(filename));
-                    break;
+                    break;
-                }
+                }
-            }
+            }
-        }
+        }
-        public void RunScriptCmd(string[] args)
+        public void RunScriptCmd(string[] args)
-        {
+        {
-            switch (args[0])
+            switch (args[0])
-            {
+            {
-                case "load":
+                case "load":
-                    Compile(args[1]);
+                    Compile(args[1]);
-                    break;
+                    break;
-                default:
+                default:
-                    MainLog.Instance.Error("Unknown script command");
+                    MainLog.Instance.Error("Unknown script command");
-                    break;
+                    break;
-            }
+            }
-        }
+        }
-        public void AddPreCompiledScript(IScript script)
+        public void AddPreCompiledScript(IScript script)
-        {
+        {
-            MainLog.Instance.Verbose("Loading script " + script.getName()); 
+            MainLog.Instance.Verbose("Loading script " + script.getName()); 
-            ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
+            ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
-            script.Initialise(scriptInfo);
+            script.Initialise(scriptInfo);
-            scripts.Add(script);
+            scripts.Add(script);
-        }
+        }
-    }
+    }
-    interface IScriptCompiler
+    interface IScriptCompiler
-    {
+    {
-        Dictionary<string,IScript> compile(string filename);
+        Dictionary<string,IScript> compile(string filename);
-        string FileExt();
+        string FileExt();
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs index 7a08735..27e831b 100644 --- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs +++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -1,107 +1,107 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
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	*/
28	using System.Collections.Generic;	28	using System.Collections.Generic;
29	using OpenSim.Framework.Console;	29	using OpenSim.Framework.Console;
30	using OpenSim.Region.Environment.Scenes;	30	using OpenSim.Region.Environment.Scenes;
31		31
32	namespace OpenSim.Region.Scripting	32	namespace OpenSim.Region.Scripting
33	{	33	{
34	public class ScriptManager	34	public class ScriptManager
35	{	35	{
36	List<IScript> scripts = new List<IScript>();	36	List<IScript> scripts = new List<IScript>();
37	Scene scene;	37	Scene scene;
38	Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();	38	Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();
39		39
40	private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)	40	private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)
41	{	41	{
42	foreach (KeyValuePair<string, IScript> script in compiledscripts)	42	foreach (KeyValuePair<string, IScript> script in compiledscripts)
43	{	43	{
44	ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.	44	ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
45	MainLog.Instance.Verbose("Loading " + script.Key);	45	MainLog.Instance.Verbose("Loading " + script.Key);
46	script.Value.Initialise(scriptInfo);	46	script.Value.Initialise(scriptInfo);
47	scripts.Add(script.Value);	47	scripts.Add(script.Value);
48	}	48	}
49	MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");	49	MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");
50	}	50	}
51		51
52	public ScriptManager(Scene world)	52	public ScriptManager(Scene world)
53	{	53	{
54	scene = world;	54	scene = world;
55		55
56	// Default Engines	56	// Default Engines
57	CSharpScriptEngine csharpCompiler = new CSharpScriptEngine();	57	CSharpScriptEngine csharpCompiler = new CSharpScriptEngine();
58	compilers.Add(csharpCompiler.FileExt(),csharpCompiler);	58	compilers.Add(csharpCompiler.FileExt(),csharpCompiler);
59		59
60	JScriptEngine jscriptCompiler = new JScriptEngine();	60	JScriptEngine jscriptCompiler = new JScriptEngine();
61	compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);	61	compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
62		62
63	JavaEngine javaCompiler = new JavaEngine();	63	JavaEngine javaCompiler = new JavaEngine();
64	compilers.Add(javaCompiler.FileExt(), javaCompiler);	64	compilers.Add(javaCompiler.FileExt(), javaCompiler);
65	}	65	}
66		66
67	public void Compile(string filename)	67	public void Compile(string filename)
68	{	68	{
69	foreach (KeyValuePair<string, IScriptCompiler> compiler in compilers)	69	foreach (KeyValuePair<string, IScriptCompiler> compiler in compilers)
70	{	70	{
71	if (filename.EndsWith(compiler.Key))	71	if (filename.EndsWith(compiler.Key))
72	{	72	{
73	LoadFromCompiler(compiler.Value.compile(filename));	73	LoadFromCompiler(compiler.Value.compile(filename));
74	break;	74	break;
75	}	75	}
76	}	76	}
77	}	77	}
78		78
79	public void RunScriptCmd(string[] args)	79	public void RunScriptCmd(string[] args)
80	{	80	{
81	switch (args[0])	81	switch (args[0])
82	{	82	{
83	case "load":	83	case "load":
84	Compile(args[1]);	84	Compile(args[1]);
85	break;	85	break;
86		86
87	default:	87	default:
88	MainLog.Instance.Error("Unknown script command");	88	MainLog.Instance.Error("Unknown script command");
89	break;	89	break;
90	}	90	}
91	}	91	}
92		92
93	public void AddPreCompiledScript(IScript script)	93	public void AddPreCompiledScript(IScript script)
94	{	94	{
95	MainLog.Instance.Verbose("Loading script " + script.getName());	95	MainLog.Instance.Verbose("Loading script " + script.getName());
96	ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.	96	ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
97	script.Initialise(scriptInfo);	97	script.Initialise(scriptInfo);
98	scripts.Add(script);	98	scripts.Add(script);
99	}	99	}
100	}	100	}
101		101
102	interface IScriptCompiler	102	interface IScriptCompiler
103	{	103	{
104	Dictionary<string,IScript> compile(string filename);	104	Dictionary<string,IScript> compile(string filename);
105	string FileExt();	105	string FileExt();
106	}	106	}
107	}	107	}