From 9b66108081a8c8cf79faaa6c541554091c40850e Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 6 Feb 2009 16:55:34 +0000 Subject: 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! --- OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 13 +++++++++++-- .../RemoteController/RemoteAdminPlugin.cs | 4 ++-- OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs | 2 +- OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs | 4 ++-- OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs | 4 ++-- OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs | 2 +- OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | 2 +- OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 2 +- .../ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs | 4 ++-- 9 files changed, 23 insertions(+), 14 deletions(-) (limited to 'OpenSim/ApplicationPlugins') 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; using OpenSim.Framework.RegionLoader.Filesystem; using OpenSim.Framework.RegionLoader.Web; +using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; +using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; +using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; +using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; +using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; + namespace OpenSim.ApplicationPlugins.LoadRegions { public class LoadRegionsPlugin : IApplicationPlugin @@ -74,8 +80,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions regionLoader.SetIniConfigSource(openSim.ConfigSource.Source); RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); - openSim.ModuleLoader.LoadDefaultSharedModules(); - + openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule()); + openSim.ModuleLoader.LoadDefaultSharedModule(new InstantMessageModule()); + openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule()); + openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule()); + openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); if (!CheckRegionsForSanity(regionsToLoad)) { m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index d9cf5bd..a036371 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -37,9 +37,9 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment.Modules.World.Terrain; -using OpenSim.Region.Environment.Scenes; using System.Collections.Generic; namespace OpenSim.ApplicationPlugins.RemoteController diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs index bd42473..4a98834 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs @@ -33,7 +33,7 @@ using System.IO; using System.Threading; using System.Xml; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs index 35b4d8a..8537da5 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs @@ -44,8 +44,8 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.ApplicationPlugins.Rest; namespace OpenSim.ApplicationPlugins.Rest.Regions diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs index 932f512..ab7e1ec 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs @@ -44,8 +44,8 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.ApplicationPlugins.Rest; namespace OpenSim.ApplicationPlugins.Rest.Regions diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs index 21caf84..80c2aa3 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs @@ -31,7 +31,7 @@ using System.Collections; using System.Collections.Generic; using System.Xml.Serialization; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.ApplicationPlugins.Rest.Regions { diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index 4c24f3f..2d13b6b 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs @@ -43,7 +43,7 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.ApplicationPlugins.Rest; namespace OpenSim.ApplicationPlugins.Rest.Regions diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index ba0d2d1..58dd729 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs @@ -41,7 +41,7 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Communications; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.ApplicationPlugins.Rest { diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs index 998f017..bc07ca7 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs @@ -30,8 +30,8 @@ using System.Reflection; using System.Text; using log4net; using Nini.Config; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OpenSim.ScriptEngine.Shared; namespace OpenSim.ApplicationPlugins.ScriptEngine -- cgit v1.1