diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 23 |
1 files changed, 8 insertions, 15 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 |