From d04025ff3dd6208a8939c320e15cc0182e045b05 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 5 Feb 2009 18:36:53 +0000
Subject: * refactor: Move module handling code up into SceneBase from Scene,
reducing the large number of different things that Scene does
---
OpenSim/Region/Environment/Scenes/Scene.cs | 186 ++---------------------------
1 file changed, 9 insertions(+), 177 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8d3792c..f798a0e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -113,25 +113,6 @@ namespace OpenSim.Region.Environment.Scenes
get { return m_sceneGridService; }
}
- ///
- /// All the region modules attached to this scene.
- ///
- public Dictionary Modules
- {
- get { return m_modules; }
- }
- protected Dictionary m_modules = new Dictionary();
-
- ///
- /// The module interfaces available from this scene.
- ///
- protected Dictionary > ModuleInterfaces = new Dictionary >();
-
- protected Dictionary ModuleAPIMethods = new Dictionary();
- protected Dictionary m_moduleCommanders = new Dictionary();
-
- //API module interfaces
-
public IXfer XferManager;
protected IXMLRPC m_xmlrpcModule;
@@ -281,11 +262,6 @@ namespace OpenSim.Region.Environment.Scenes
public int objectCapacity = 45000;
- ///
- /// Registered classes that are capable of creating entities.
- ///
- protected Dictionary m_entityCreators = new Dictionary();
-
#endregion
#region Constructors
@@ -737,16 +713,6 @@ namespace OpenSim.Region.Environment.Scenes
// De-register with region communications (events cleanup)
UnRegisterRegionWithComms();
- // Shut down all non shared modules.
- foreach (IRegionModule module in Modules.Values)
- {
- if (!module.IsSharedModule)
- {
- module.Close();
- }
- }
- Modules.Clear();
-
// call the base class Close method.
base.Close();
}
@@ -1838,6 +1804,7 @@ namespace OpenSim.Region.Environment.Scenes
///
/// Add an object into the scene that has come from storage
///
+ ///
///
///
/// If true, changes to the object will be reflected in its persisted data
@@ -3158,128 +3125,8 @@ namespace OpenSim.Region.Environment.Scenes
#endregion
- #region Module Methods
-
- ///
- /// Add a module to this scene.
- ///
- ///
- ///
- public void AddModule(string name, IRegionModule module)
- {
- if (!Modules.ContainsKey(name))
- {
- Modules.Add(name, module);
- }
- }
-
- public void RegisterModuleCommander(string name, ICommander commander)
- {
- lock (m_moduleCommanders)
- {
- m_moduleCommanders.Add(name, commander);
- }
- }
-
- public ICommander GetCommander(string name)
- {
- lock (m_moduleCommanders)
- {
- return m_moduleCommanders[name];
- }
- }
-
- public Dictionary GetCommanders()
- {
- return m_moduleCommanders;
- }
-
- ///
- /// Register an interface to a region module. This allows module methods to be called directly as
- /// well as via events. If there is already a module registered for this interface, it is not replaced
- /// (is this the best behaviour?)
- ///
- ///
- public void RegisterModuleInterface(M mod)
- {
- if (!ModuleInterfaces.ContainsKey(typeof(M)))
- {
- List