diff options
author | Jeff Ames | 2008-09-21 02:41:22 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-21 02:41:22 +0000 |
commit | c8349e21c43b1232aa923783a39cca224460551a (patch) | |
tree | 883f756507ea9984f5e7d56a4aa507d0640b57ee /OpenSim/ScriptEngine/Engines | |
parent | Fix an exception in new ScriptEngine loader where a region would (diff) | |
download | opensim-SC-c8349e21c43b1232aa923783a39cca224460551a.zip opensim-SC-c8349e21c43b1232aa923783a39cca224460551a.tar.gz opensim-SC-c8349e21c43b1232aa923783a39cca224460551a.tar.bz2 opensim-SC-c8349e21c43b1232aa923783a39cca224460551a.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/ScriptEngine/Engines')
-rw-r--r-- | OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs | 148 | ||||
-rw-r--r-- | OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs | 72 |
2 files changed, 110 insertions, 110 deletions
diff --git a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs index 7179e6c..3f24763 100644 --- a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs +++ b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs | |||
@@ -1,74 +1,74 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Text; | 30 | using System.Text; |
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.ApplicationPlugins.ScriptEngine; | 33 | using OpenSim.ApplicationPlugins.ScriptEngine; |
34 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Environment.Scenes; |
36 | using ComponentProviders = OpenSim.ApplicationPlugins.ScriptEngine.ComponentRegistry; | 36 | using ComponentProviders = OpenSim.ApplicationPlugins.ScriptEngine.ComponentRegistry; |
37 | 37 | ||
38 | namespace OpenSim.ScriptEngine.Engines.DotNetEngine | 38 | namespace OpenSim.ScriptEngine.Engines.DotNetEngine |
39 | { | 39 | { |
40 | // This is a sample engine | 40 | // This is a sample engine |
41 | public class DotNetEngine : RegionScriptEngineBase | 41 | public class DotNetEngine : RegionScriptEngineBase |
42 | { | 42 | { |
43 | 43 | ||
44 | 44 | ||
45 | // This will be the makeup of this script engine | 45 | // This will be the makeup of this script engine |
46 | public string[] ComponentNames = new string[] { | 46 | public string[] ComponentNames = new string[] { |
47 | "Commands_LSL", | 47 | "Commands_LSL", |
48 | "Commands_OSSL", | 48 | "Commands_OSSL", |
49 | "Compiler_CS", | 49 | "Compiler_CS", |
50 | "Compiler_JS", | 50 | "Compiler_JS", |
51 | "Compiler_LSL", | 51 | "Compiler_LSL", |
52 | "Compiler_VB", | 52 | "Compiler_VB", |
53 | "LSLEventProvider", | 53 | "LSLEventProvider", |
54 | "Scheduler" | 54 | "Scheduler" |
55 | }; | 55 | }; |
56 | 56 | ||
57 | public override string Name | 57 | public override string Name |
58 | { | 58 | { |
59 | get { return "DotNetEngine"; } | 59 | get { return "DotNetEngine"; } |
60 | } | 60 | } |
61 | 61 | ||
62 | public override void Initialize() | 62 | public override void Initialize() |
63 | { | 63 | { |
64 | // We need to initialize the components we will be using. Our baseclass already has builtin functions for this. | 64 | // We need to initialize the components we will be using. Our baseclass already has builtin functions for this. |
65 | m_log.Info("[" + Name + "]: Initializing SECs (Script Engine Components)"); | 65 | m_log.Info("[" + Name + "]: Initializing SECs (Script Engine Components)"); |
66 | InitializeComponents(ComponentNames); | 66 | InitializeComponents(ComponentNames); |
67 | } | 67 | } |
68 | 68 | ||
69 | public override void PreClose() | 69 | public override void PreClose() |
70 | { | 70 | { |
71 | // Before | 71 | // Before |
72 | } | 72 | } |
73 | } | 73 | } |
74 | } | 74 | } |
diff --git a/OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs index bac01d3..e828406 100644 --- a/OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/ScriptEngine/Engines/DotNetEngine/Properties/AssemblyInfo.cs | |||
@@ -1,36 +1,36 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.ScriptEngine.Engines.DotNetEngine")] | 8 | [assembly: AssemblyTitle("OpenSim.ScriptEngine.Engines.DotNetEngine")] |
9 | [assembly: AssemblyDescription("")] | 9 | [assembly: AssemblyDescription("")] |
10 | [assembly: AssemblyConfiguration("")] | 10 | [assembly: AssemblyConfiguration("")] |
11 | [assembly: AssemblyCompany("Microsoft")] | 11 | [assembly: AssemblyCompany("Microsoft")] |
12 | [assembly: AssemblyProduct("OpenSim.ScriptEngine.Engines.DotNetEngine")] | 12 | [assembly: AssemblyProduct("OpenSim.ScriptEngine.Engines.DotNetEngine")] |
13 | [assembly: AssemblyCopyright("Copyright © Microsoft 2008")] | 13 | [assembly: AssemblyCopyright("Copyright © Microsoft 2008")] |
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 22 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
23 | [assembly: Guid("1d1c68a7-026f-4556-a060-4af69f488d2a")] | 23 | [assembly: Guid("1d1c68a7-026f-4556-a060-4af69f488d2a")] |
24 | 24 | ||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | // You can specify all the values or you can default the Build and Revision Numbers | 32 | // You can specify all the values or you can default the Build and Revision Numbers |
33 | // by using the '*' as shown below: | 33 | // by using the '*' as shown below: |
34 | // [assembly: AssemblyVersion("1.0.*")] | 34 | // [assembly: AssemblyVersion("1.0.*")] |
35 | [assembly: AssemblyVersion("1.0.0.0")] | 35 | [assembly: AssemblyVersion("1.0.0.0")] |
36 | [assembly: AssemblyFileVersion("1.0.0.0")] | 36 | [assembly: AssemblyFileVersion("1.0.0.0")] |