1 files changed, 126 insertions, 126 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
index a38be07..a80ac85 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -1,126 +1,126 @@
-/*
+/*
-* 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;
+using System;
-using System.CodeDom.Compiler;
+using System.CodeDom.Compiler;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using libTerrain;
+using libTerrain;
-using Microsoft.CSharp;
+using Microsoft.CSharp;
-using Microsoft.JScript;
+using Microsoft.JScript;
-namespace OpenSim.Region.Terrain
+namespace OpenSim.Region.Terrain
-{
+{
-    public interface ITerrainFilter
+    public interface ITerrainFilter
-    {
+    {
-        void Filter(Channel heightmap, string[] args);
+        void Filter(Channel heightmap, string[] args);
-        string Register();
+        string Register();
-        string Help();
+        string Help();
-    }
+    }
-    public class TestFilter : ITerrainFilter
+    public class TestFilter : ITerrainFilter
-    {
+    {
-        public void Filter(Channel heightmap, string[] args)
+        public void Filter(Channel heightmap, string[] args)
-        {
+        {
-            Console.WriteLine("Hello world");
+            Console.WriteLine("Hello world");
-        }
+        }
-        public string Register()
+        public string Register()
-        {
+        {
-            return "demofilter";
+            return "demofilter";
-        }
+        }
-        public string Help()
+        public string Help()
-        {
+        {
-            return "demofilter - Does nothing";
+            return "demofilter - Does nothing";
-        }
+        }
-    }
+    }
-    public class FilterHost
+    public class FilterHost
-    {
+    {
-        public Dictionary<string, ITerrainFilter> filters = new Dictionary<string, ITerrainFilter>();
+        public Dictionary<string, ITerrainFilter> filters = new Dictionary<string, ITerrainFilter>();
-        private void LoadFilter(CodeDomProvider compiler, string filename)
+        private void LoadFilter(CodeDomProvider compiler, string filename)
-        {
+        {
-            CompilerParameters compilerParams = new CompilerParameters();
+            CompilerParameters compilerParams = new CompilerParameters();
-            CompilerResults compilerResults;
+            CompilerResults compilerResults;
-            compilerParams.GenerateExecutable = false;
+            compilerParams.GenerateExecutable = false;
-            compilerParams.GenerateInMemory = true;
+            compilerParams.GenerateInMemory = true;
-            compilerParams.IncludeDebugInformation = false;
+            compilerParams.IncludeDebugInformation = false;
-            compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");
+            compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");
-            compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");
+            compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");
-            compilerParams.ReferencedAssemblies.Add("System.dll");
+            compilerParams.ReferencedAssemblies.Add("System.dll");
-            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
+            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
-            if (compilerResults.Errors.Count > 0)
+            if (compilerResults.Errors.Count > 0)
-            {
+            {
-                Console.WriteLine("Compile errors:");
+                Console.WriteLine("Compile errors:");
-                foreach (CompilerError error in compilerResults.Errors)
+                foreach (CompilerError error in compilerResults.Errors)
-                {
+                {
-                    Console.WriteLine(error.Line.ToString() + ": " + error.ErrorText.ToString());
+                    Console.WriteLine(error.Line.ToString() + ": " + error.ErrorText.ToString());
-                }
+                }
-            }
+            }
-            else
+            else
-            {
+            {
-                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
+                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
-                {
+                {
-                    Type testInterface = pluginType.GetInterface("ITerrainFilter",true);
+                    Type testInterface = pluginType.GetInterface("ITerrainFilter",true);
-                    if (testInterface != null)
+                    if (testInterface != null)
-                    {
+                    {
-                        ITerrainFilter filter = (ITerrainFilter)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
+                        ITerrainFilter filter = (ITerrainFilter)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
-                        string filterName = filter.Register();
+                        string filterName = filter.Register();
-                        Console.WriteLine("Plugin: " + filterName + " loaded.");
+                        Console.WriteLine("Plugin: " + filterName + " loaded.");
-                        if (!filters.ContainsKey(filterName))
+                        if (!filters.ContainsKey(filterName))
-                        {
+                        {
-                            filters.Add(filterName, filter);
+                            filters.Add(filterName, filter);
-                        }
+                        }
-                        else
+                        else
-                        {
+                        {
-                            filters[filterName] = filter;
+                            filters[filterName] = filter;
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        public void LoadFilterCSharp(string filename)
+        public void LoadFilterCSharp(string filename)
-        {
+        {
-            CSharpCodeProvider compiler = new CSharpCodeProvider();
+            CSharpCodeProvider compiler = new CSharpCodeProvider();
-            LoadFilter(compiler, filename);
+            LoadFilter(compiler, filename);
-        }
+        }
-        public void LoadFilterJScript(string filename)
+        public void LoadFilterJScript(string filename)
-        {
+        {
-            JScriptCodeProvider compiler = new JScriptCodeProvider();
+            JScriptCodeProvider compiler = new JScriptCodeProvider();
-            LoadFilter(compiler, filename);
+            LoadFilter(compiler, filename);
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs index a38be07..a80ac85 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs
@@ -1,126 +1,126 @@
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;	28	using System;
29	using System.CodeDom.Compiler;	29	using System.CodeDom.Compiler;
30	using System.Collections.Generic;	30	using System.Collections.Generic;
31	using libTerrain;	31	using libTerrain;
32	using Microsoft.CSharp;	32	using Microsoft.CSharp;
33	using Microsoft.JScript;	33	using Microsoft.JScript;
34		34
35	namespace OpenSim.Region.Terrain	35	namespace OpenSim.Region.Terrain
36	{	36	{
37	public interface ITerrainFilter	37	public interface ITerrainFilter
38	{	38	{
39	void Filter(Channel heightmap, string[] args);	39	void Filter(Channel heightmap, string[] args);
40	string Register();	40	string Register();
41	string Help();	41	string Help();
42	}	42	}
43		43
44	public class TestFilter : ITerrainFilter	44	public class TestFilter : ITerrainFilter
45	{	45	{
46	public void Filter(Channel heightmap, string[] args)	46	public void Filter(Channel heightmap, string[] args)
47	{	47	{
48	Console.WriteLine("Hello world");	48	Console.WriteLine("Hello world");
49	}	49	}
50		50
51	public string Register()	51	public string Register()
52	{	52	{
53	return "demofilter";	53	return "demofilter";
54	}	54	}
55		55
56	public string Help()	56	public string Help()
57	{	57	{
58	return "demofilter - Does nothing";	58	return "demofilter - Does nothing";
59	}	59	}
60	}	60	}
61		61
62	public class FilterHost	62	public class FilterHost
63	{	63	{
64	public Dictionary<string, ITerrainFilter> filters = new Dictionary<string, ITerrainFilter>();	64	public Dictionary<string, ITerrainFilter> filters = new Dictionary<string, ITerrainFilter>();
65		65
66	private void LoadFilter(CodeDomProvider compiler, string filename)	66	private void LoadFilter(CodeDomProvider compiler, string filename)
67	{	67	{
68	CompilerParameters compilerParams = new CompilerParameters();	68	CompilerParameters compilerParams = new CompilerParameters();
69	CompilerResults compilerResults;	69	CompilerResults compilerResults;
70	compilerParams.GenerateExecutable = false;	70	compilerParams.GenerateExecutable = false;
71	compilerParams.GenerateInMemory = true;	71	compilerParams.GenerateInMemory = true;
72	compilerParams.IncludeDebugInformation = false;	72	compilerParams.IncludeDebugInformation = false;
73	compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");	73	compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll");
74	compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");	74	compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll");
75	compilerParams.ReferencedAssemblies.Add("System.dll");	75	compilerParams.ReferencedAssemblies.Add("System.dll");
76		76
77	compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);	77	compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);
78		78
79	if (compilerResults.Errors.Count > 0)	79	if (compilerResults.Errors.Count > 0)
80	{	80	{
81	Console.WriteLine("Compile errors:");	81	Console.WriteLine("Compile errors:");
82	foreach (CompilerError error in compilerResults.Errors)	82	foreach (CompilerError error in compilerResults.Errors)
83	{	83	{
84	Console.WriteLine(error.Line.ToString() + ": " + error.ErrorText.ToString());	84	Console.WriteLine(error.Line.ToString() + ": " + error.ErrorText.ToString());
85	}	85	}
86	}	86	}
87	else	87	else
88	{	88	{
89	foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())	89	foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())
90	{	90	{
91	Type testInterface = pluginType.GetInterface("ITerrainFilter",true);	91	Type testInterface = pluginType.GetInterface("ITerrainFilter",true);
92		92
93	if (testInterface != null)	93	if (testInterface != null)
94	{	94	{
95	ITerrainFilter filter = (ITerrainFilter)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());	95	ITerrainFilter filter = (ITerrainFilter)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());
96		96
97	string filterName = filter.Register();	97	string filterName = filter.Register();
98	Console.WriteLine("Plugin: " + filterName + " loaded.");	98	Console.WriteLine("Plugin: " + filterName + " loaded.");
99		99
100	if (!filters.ContainsKey(filterName))	100	if (!filters.ContainsKey(filterName))
101	{	101	{
102	filters.Add(filterName, filter);	102	filters.Add(filterName, filter);
103	}	103	}
104	else	104	else
105	{	105	{
106	filters[filterName] = filter;	106	filters[filterName] = filter;
107	}	107	}
108	}	108	}
109	}	109	}
110	}	110	}
111		111
112	}	112	}
113		113
114	public void LoadFilterCSharp(string filename)	114	public void LoadFilterCSharp(string filename)
115	{	115	{
116	CSharpCodeProvider compiler = new CSharpCodeProvider();	116	CSharpCodeProvider compiler = new CSharpCodeProvider();
117	LoadFilter(compiler, filename);	117	LoadFilter(compiler, filename);
118	}	118	}
119		119
120	public void LoadFilterJScript(string filename)	120	public void LoadFilterJScript(string filename)
121	{	121	{
122	JScriptCodeProvider compiler = new JScriptCodeProvider();	122	JScriptCodeProvider compiler = new JScriptCodeProvider();
123	LoadFilter(compiler, filename);	123	LoadFilter(compiler, filename);
124	}	124	}
125	}	125	}
126	}	126	}