diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 23 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | 31 |
2 files changed, 25 insertions, 29 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 3c27108..b897c60 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -1,4 +1,4 @@ | |||
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 | * |
@@ -26,21 +26,14 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | 29 | using Mono.Addins; |
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | using OpenSim; | ||
33 | using OpenSim.Framework.Console; | ||
34 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Framework.Console; | ||
35 | using OpenSim.Framework.RegionLoader.Filesystem; | 32 | using OpenSim.Framework.RegionLoader.Filesystem; |
36 | using OpenSim.Framework.RegionLoader.Web; | 33 | using OpenSim.Framework.RegionLoader.Web; |
37 | using Mono.Addins; | ||
38 | using Mono.Addins.Description; | ||
39 | using Nini; | ||
40 | using Nini.Config; | ||
41 | 34 | ||
42 | [assembly:Addin] | 35 | [assembly : Addin] |
43 | [assembly:AddinDependency ("OpenSim", "0.4")] | 36 | [assembly : AddinDependency("OpenSim", "0.4")] |
44 | 37 | ||
45 | namespace OpenSim.ApplicationPlugins.LoadRegions | 38 | namespace OpenSim.ApplicationPlugins.LoadRegions |
46 | { | 39 | { |
@@ -65,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
65 | 58 | ||
66 | regionLoader.SetIniConfigSource(openSim.ConfigSource); | 59 | regionLoader.SetIniConfigSource(openSim.ConfigSource); |
67 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); | 60 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); |
68 | 61 | ||
69 | openSim.ModuleLoader.LoadDefaultSharedModules(); | 62 | openSim.ModuleLoader.LoadDefaultSharedModules(); |
70 | 63 | ||
71 | for (int i = 0; i < regionsToLoad.Length; i++) | 64 | for (int i = 0; i < regionsToLoad.Length; i++) |
@@ -77,6 +70,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
77 | openSim.ModuleLoader.PostInitialise(); | 70 | openSim.ModuleLoader.PostInitialise(); |
78 | openSim.ModuleLoader.ClearCache(); | 71 | openSim.ModuleLoader.ClearCache(); |
79 | } | 72 | } |
73 | |||
80 | public void LoadRegionFromConfig(OpenSimMain openSim, ulong regionhandle) | 74 | public void LoadRegionFromConfig(OpenSimMain openSim, ulong regionhandle) |
81 | { | 75 | { |
82 | MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised"); | 76 | MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised"); |
@@ -103,11 +97,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
103 | openSim.CreateRegion(regionsToLoad[i]); | 97 | openSim.CreateRegion(regionsToLoad[i]); |
104 | } | 98 | } |
105 | } | 99 | } |
106 | |||
107 | } | 100 | } |
101 | |||
108 | public void Close() | 102 | public void Close() |
109 | { | 103 | { |
110 | |||
111 | } | 104 | } |
112 | } | 105 | } |
113 | } \ No newline at end of file | 106 | } \ No newline at end of file |
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs index 0b5f4bd..ffb3e48 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | |||
@@ -1,26 +1,28 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 2 | using System.Runtime.InteropServices; |
4 | 3 | ||
5 | // General Information about an assembly is controlled through the following | 4 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 5 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 6 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Addin")] | 7 | |
9 | [assembly: AssemblyDescription("")] | 8 | [assembly : AssemblyTitle("OpenSim.Addin")] |
10 | [assembly: AssemblyConfiguration("")] | 9 | [assembly : AssemblyDescription("")] |
11 | [assembly: AssemblyCompany("")] | 10 | [assembly : AssemblyConfiguration("")] |
12 | [assembly: AssemblyProduct("OpenSim.Addin")] | 11 | [assembly : AssemblyCompany("")] |
13 | [assembly: AssemblyCopyright("Copyright © 2007")] | 12 | [assembly : AssemblyProduct("OpenSim.Addin")] |
14 | [assembly: AssemblyTrademark("")] | 13 | [assembly : AssemblyCopyright("Copyright © 2007")] |
15 | [assembly: AssemblyCulture("")] | 14 | [assembly : AssemblyTrademark("")] |
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 | |
21 | [assembly : ComVisible(false)] | ||
21 | 22 | ||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | 23 | // The following GUID is for the ID of the typelib if this project is exposed to COM |
23 | [assembly: Guid("45b979d9-d8d4-42fd-9780-fe9ac7e86cb4")] | 24 | |
25 | [assembly : Guid("45b979d9-d8d4-42fd-9780-fe9ac7e86cb4")] | ||
24 | 26 | ||
25 | // Version information for an assembly consists of the following four values: | 27 | // Version information for an assembly consists of the following four values: |
26 | // | 28 | // |
@@ -32,5 +34,6 @@ using System.Runtime.InteropServices; | |||
32 | // You can specify all the values or you can default the Build and Revision Numbers | 34 | // You can specify all the values or you can default the Build and Revision Numbers |
33 | // by using the '*' as shown below: | 35 | // by using the '*' as shown below: |
34 | // [assembly: AssemblyVersion("1.0.*")] | 36 | // [assembly: AssemblyVersion("1.0.*")] |
35 | [assembly: AssemblyVersion("1.0.0.0")] | 37 | |
36 | [assembly: AssemblyFileVersion("1.0.0.0")] | 38 | [assembly : AssemblyVersion("1.0.0.0")] |
39 | [assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file | ||