aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/LoadRegions
diff options
context:
space:
mode:
authorDr Scofield2009-02-06 16:55:34 +0000
committerDr Scofield2009-02-06 16:55:34 +0000
commit9b66108081a8c8cf79faaa6c541554091c40850e (patch)
tree095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/ApplicationPlugins/LoadRegions
parent* removed superfluous constants class (diff)
downloadopensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz
This changeset is the step 1 of 2 in refactoring
OpenSim.Region.Environment into a "framework" part and a modules only part. This first changeset refactors OpenSim.Region.Environment.Scenes, OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region modules in OpenSim.Region.Environment. The next step will be to move region modules up from OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and then sort out which modules are really core modules and which should move out to forge. I've been very careful to NOT BREAK anything. i hope i've succeeded. as this is the work of a whole week i hope i managed to keep track with the applied patches of the last week --- could any of you that did check in stuff have a look at whether it survived? thx!
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index c043363..024c910 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -34,6 +34,12 @@ using OpenSim.Framework;
34using OpenSim.Framework.RegionLoader.Filesystem; 34using OpenSim.Framework.RegionLoader.Filesystem;
35using OpenSim.Framework.RegionLoader.Web; 35using OpenSim.Framework.RegionLoader.Web;
36 36
37using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
38using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
39using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
40using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
41using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
42
37namespace OpenSim.ApplicationPlugins.LoadRegions 43namespace OpenSim.ApplicationPlugins.LoadRegions
38{ 44{
39 public class LoadRegionsPlugin : IApplicationPlugin 45 public class LoadRegionsPlugin : IApplicationPlugin
@@ -74,8 +80,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
74 regionLoader.SetIniConfigSource(openSim.ConfigSource.Source); 80 regionLoader.SetIniConfigSource(openSim.ConfigSource.Source);
75 RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); 81 RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
76 82
77 openSim.ModuleLoader.LoadDefaultSharedModules(); 83 openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
78 84 openSim.ModuleLoader.LoadDefaultSharedModule(new InstantMessageModule());
85 openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
86 openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
87 openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
79 if (!CheckRegionsForSanity(regionsToLoad)) 88 if (!CheckRegionsForSanity(regionsToLoad))
80 { 89 {
81 m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); 90 m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations");