aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
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
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 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs13
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs2
-rw-r--r--OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs4
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;
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");
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;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Region.Environment.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Environment.Modules.World.Terrain; 42using OpenSim.Region.Environment.Modules.World.Terrain;
42using OpenSim.Region.Environment.Scenes;
43using System.Collections.Generic; 43using System.Collections.Generic;
44 44
45namespace OpenSim.ApplicationPlugins.RemoteController 45namespace 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;
33using System.Threading; 33using System.Threading;
34using System.Xml; 34using System.Xml;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 39using 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;
44using OpenSim.Framework.Console; 44using OpenSim.Framework.Console;
45using OpenSim.Framework.Servers; 45using OpenSim.Framework.Servers;
46using OpenSim.Framework.Communications; 46using OpenSim.Framework.Communications;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.ApplicationPlugins.Rest; 49using OpenSim.ApplicationPlugins.Rest;
50 50
51namespace OpenSim.ApplicationPlugins.Rest.Regions 51namespace 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;
44using OpenSim.Framework.Console; 44using OpenSim.Framework.Console;
45using OpenSim.Framework.Servers; 45using OpenSim.Framework.Servers;
46using OpenSim.Framework.Communications; 46using OpenSim.Framework.Communications;
47using OpenSim.Region.Environment.Interfaces; 47using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Environment.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.ApplicationPlugins.Rest; 49using OpenSim.ApplicationPlugins.Rest;
50 50
51namespace OpenSim.ApplicationPlugins.Rest.Regions 51namespace 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;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Xml.Serialization; 32using System.Xml.Serialization;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.ApplicationPlugins.Rest.Regions 36namespace 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;
43using OpenSim.Framework.Console; 43using OpenSim.Framework.Console;
44using OpenSim.Framework.Servers; 44using OpenSim.Framework.Servers;
45using OpenSim.Framework.Communications; 45using OpenSim.Framework.Communications;
46using OpenSim.Region.Environment.Scenes; 46using OpenSim.Region.Framework.Scenes;
47using OpenSim.ApplicationPlugins.Rest; 47using OpenSim.ApplicationPlugins.Rest;
48 48
49namespace OpenSim.ApplicationPlugins.Rest.Regions 49namespace 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;
41using OpenSim.Framework.Console; 41using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Framework.Communications; 43using OpenSim.Framework.Communications;
44using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Framework.Scenes;
45 45
46namespace OpenSim.ApplicationPlugins.Rest 46namespace 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;
30using System.Text; 30using System.Text;
31using log4net; 31using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.ScriptEngine.Shared; 35using OpenSim.ScriptEngine.Shared;
36 36
37namespace OpenSim.ApplicationPlugins.ScriptEngine 37namespace OpenSim.ApplicationPlugins.ScriptEngine