diff options
author | Dr Scofield | 2009-02-06 16:55:34 +0000 |
---|---|---|
committer | Dr Scofield | 2009-02-06 16:55:34 +0000 |
commit | 9b66108081a8c8cf79faaa6c541554091c40850e (patch) | |
tree | 095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/ApplicationPlugins | |
parent | * removed superfluous constants class (diff) | |
download | opensim-SC-9b66108081a8c8cf79faaa6c541554091c40850e.zip opensim-SC-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz opensim-SC-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2 opensim-SC-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 '')
9 files changed, 23 insertions, 14 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; | |||
34 | using OpenSim.Framework.RegionLoader.Filesystem; | 34 | using OpenSim.Framework.RegionLoader.Filesystem; |
35 | using OpenSim.Framework.RegionLoader.Web; | 35 | using OpenSim.Framework.RegionLoader.Web; |
36 | 36 | ||
37 | using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; | ||
38 | using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; | ||
39 | using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; | ||
40 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; | ||
41 | using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; | ||
42 | |||
37 | namespace OpenSim.ApplicationPlugins.LoadRegions | 43 | namespace 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"); |
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; | |||
37 | using Nwc.XmlRpc; | 37 | using Nwc.XmlRpc; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Servers; | 39 | using OpenSim.Framework.Servers; |
40 | using OpenSim.Region.Environment.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes; | ||
41 | using OpenSim.Region.Environment.Modules.World.Terrain; | 42 | using OpenSim.Region.Environment.Modules.World.Terrain; |
42 | using OpenSim.Region.Environment.Scenes; | ||
43 | using System.Collections.Generic; | 43 | using System.Collections.Generic; |
44 | 44 | ||
45 | namespace OpenSim.ApplicationPlugins.RemoteController | 45 | 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; | |||
33 | using System.Threading; | 33 | using System.Threading; |
34 | using System.Xml; | 34 | using System.Xml; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Environment.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Communications.Cache; | 39 | 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; | |||
44 | using OpenSim.Framework.Console; | 44 | using OpenSim.Framework.Console; |
45 | using OpenSim.Framework.Servers; | 45 | using OpenSim.Framework.Servers; |
46 | using OpenSim.Framework.Communications; | 46 | using OpenSim.Framework.Communications; |
47 | using OpenSim.Region.Environment.Interfaces; | 47 | using OpenSim.Region.Framework.Interfaces; |
48 | using OpenSim.Region.Environment.Scenes; | 48 | using OpenSim.Region.Framework.Scenes; |
49 | using OpenSim.ApplicationPlugins.Rest; | 49 | using OpenSim.ApplicationPlugins.Rest; |
50 | 50 | ||
51 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 51 | 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; | |||
44 | using OpenSim.Framework.Console; | 44 | using OpenSim.Framework.Console; |
45 | using OpenSim.Framework.Servers; | 45 | using OpenSim.Framework.Servers; |
46 | using OpenSim.Framework.Communications; | 46 | using OpenSim.Framework.Communications; |
47 | using OpenSim.Region.Environment.Interfaces; | 47 | using OpenSim.Region.Framework.Interfaces; |
48 | using OpenSim.Region.Environment.Scenes; | 48 | using OpenSim.Region.Framework.Scenes; |
49 | using OpenSim.ApplicationPlugins.Rest; | 49 | using OpenSim.ApplicationPlugins.Rest; |
50 | 50 | ||
51 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 51 | 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; | |||
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
32 | using System.Xml.Serialization; | 32 | using System.Xml.Serialization; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Environment.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 36 | namespace OpenSim.ApplicationPlugins.Rest.Regions |
37 | { | 37 | { |
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; | |||
43 | using OpenSim.Framework.Console; | 43 | using OpenSim.Framework.Console; |
44 | using OpenSim.Framework.Servers; | 44 | using OpenSim.Framework.Servers; |
45 | using OpenSim.Framework.Communications; | 45 | using OpenSim.Framework.Communications; |
46 | using OpenSim.Region.Environment.Scenes; | 46 | using OpenSim.Region.Framework.Scenes; |
47 | using OpenSim.ApplicationPlugins.Rest; | 47 | using OpenSim.ApplicationPlugins.Rest; |
48 | 48 | ||
49 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 49 | 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; | |||
41 | using OpenSim.Framework.Console; | 41 | using OpenSim.Framework.Console; |
42 | using OpenSim.Framework.Servers; | 42 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Framework.Communications; | 43 | using OpenSim.Framework.Communications; |
44 | using OpenSim.Region.Environment.Scenes; | 44 | using OpenSim.Region.Framework.Scenes; |
45 | 45 | ||
46 | namespace OpenSim.ApplicationPlugins.Rest | 46 | namespace OpenSim.ApplicationPlugins.Rest |
47 | { | 47 | { |
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; | |||
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.Region.Environment.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Environment.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | using OpenSim.ScriptEngine.Shared; | 35 | using OpenSim.ScriptEngine.Shared; |
36 | 36 | ||
37 | namespace OpenSim.ApplicationPlugins.ScriptEngine | 37 | namespace OpenSim.ApplicationPlugins.ScriptEngine |