From 0d15a6a01feeb129b015f7516fd13a541b3e6fce Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Nov 2012 19:18:20 +0000
Subject: Remove any mention of IRegionModule from region names and comments to
aid grepping for remaining uses
---
.../RegionModulesController/RegionModulesControllerPlugin.cs | 2 +-
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | 2 +-
.../Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | 4 ++--
.../ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 4 ++--
.../CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | 2 +-
OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 2 +-
.../Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 2 +-
.../CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 2 +-
.../Avatar/Inventory/Transfer/InventoryTransferModule.cs | 2 +-
.../ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs | 2 +-
.../Authentication/AuthenticationServiceInConnectorModule.cs | 2 +-
.../ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs | 2 +-
.../Hypergrid/HypergridServiceInConnectorModule.cs | 2 +-
.../Inventory/InventoryServiceInConnectorModule.cs | 2 +-
.../ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs | 2 +-
.../ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs | 2 +-
.../MapImage/MapImageServiceInConnectorModule.cs | 2 +-
.../Neighbour/NeighbourServiceInConnectorModule.cs | 2 +-
.../Simulation/SimulationServiceInConnectorModule.cs | 2 +-
.../ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 6 +++---
.../ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 6 +++---
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 2 +-
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 2 +-
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 2 +-
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 2 +-
.../OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 2 +-
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 2 +-
.../Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | 2 +-
.../Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | 2 +-
.../Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | 2 +-
.../OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | 2 +-
.../Freeswitch/FreeswitchServiceInConnectorModule.cs | 2 +-
.../OptionalModules/World/TreePopulator/TreePopulatorModule.cs | 3 +--
33 files changed, 39 insertions(+), 40 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 49bd911..633d005 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -215,7 +215,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
}
}
-#region IRegionModulesController implementation
+#region Region Module interfacesController implementation
///
/// Check that the given module is no disabled in the [Modules] section of the config files.
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 0d7b1fc..9bb0f5e 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.Linden
private bool m_Enabled = true;
private string m_URL;
- #region IRegionModuleBase Members
+ #region Region Module interfaceBase Members
public Type ReplaceableInterface
{
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
index 52c4f44..c03e6e6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.Linden
private bool m_enabled = true;
private int m_levelUpload = 0;
- #region IRegionModuleBase Members
+ #region Region Module interfaceBase Members
public Type ReplaceableInterface
@@ -98,7 +98,7 @@ namespace OpenSim.Region.ClientStack.Linden
#endregion
- #region IRegionModule Members
+ #region Region Module interface
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
index ba902b2..725b4f1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.Linden
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene;
- #region IRegionModuleBase Members
+ #region Region Module interfaceBase Members
public Type ReplaceableInterface
@@ -92,7 +92,7 @@ namespace OpenSim.Region.ClientStack.Linden
#endregion
- #region IRegionModule Members
+ #region Region Module interface
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 73d1f72..e973652 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
private Dictionary AgentTransactions =
new Dictionary();
- #region IRegionModule Members
+ #region Region Module interface
public void Initialise(IConfigSource source)
{
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index a54fec7..47c4b59 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
get { return null; }
}
- #endregion IRegionModule
+ #endregion Region Module interface
#region IJ2KDecoder
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index c3e4679..aaeeb24 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
private object m_setAppearanceLock = new object();
- #region IRegionModule
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index ca5d485..569ef26 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
private readonly List m_scenes = new List();
- #region IRegionModule Members
+ #region Region Module interface
private IMessageTransferModule m_TransferModule = null;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index e200775..24208df 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
private IMessageTransferModule m_TransferModule = null;
private bool m_Enabled = true;
- #region IRegionModule Members
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 5541684..563b1a1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
private IConfigSource m_Config;
bool m_Registered = false;
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
index ccf2275..2c6a0b8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
private IConfigSource m_Config;
bool m_Registered = false;
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
index 0e16e5a..f37b75c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
private IConfigSource m_Config;
bool m_Registered = false;
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
index a7dd0dd..f681ef2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
private GatekeeperServiceInConnector m_HypergridHandler;
private UserAgentServerConnector m_UASHandler;
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 831ea27..87b4119 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
private IConfigSource m_Config;
bool m_Registered = false;
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 2f3c350..dab89ea 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
private IConfigSource m_Config;
private List m_Scenes = new List();
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
index ecdb380..0a86fb7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
private IConfigSource m_Config;
private List m_Scenes = new List();
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
index d38af23..ec14a98 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
private IConfigSource m_Config;
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index b544ab3..1f26ed9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
private IConfigSource m_Config;
private List m_Scenes = new List();
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index 0a5275d..4748e19 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
private IConfigSource m_Config;
bool m_Registered = false;
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 1e52d37..316ecd2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
///
private bool m_ModuleEnabled = false;
- #region IRegionModule
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
@@ -156,7 +156,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
}
}
- #endregion /* IRegionModule */
+ #endregion
#region ISimulation
@@ -374,4 +374,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
#endregion
}
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index bd4a23b..bc505a1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
protected bool m_safemode;
protected IPAddress m_thisIP;
- #region IRegionModule
+ #region Region Module interface
public virtual void Initialise(IConfigSource config)
{
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName);
}
- #endregion /* IRegionModule */
+ #endregion
#region IInterregionComms
@@ -302,4 +302,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
#endregion /* IInterregionComms */
}
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 0e6d663..39cc93d 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1072,7 +1072,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
#endregion
- #region IRegionModule Members
+ #region Region Module interface
public string Name { get { return "EstateManagementModule"; } }
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index aa306c7..6a443d0 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
#endregion
- #region IRegionModule Members
+ #region Region Module interface
public void Initialise(IConfigSource source)
{
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 2d762fb..9e81331 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
private bool m_useAntiAliasing = false; // TODO: Make this a config option
private bool m_Enabled = false;
- #region IRegionModule Members
+ #region Region Module interface
public void Initialise(IConfigSource source)
{
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 18aa609..a7b9099 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.DataSnapshot
#endregion
- #region IRegionModule
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 1528330..e03a27c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
private int m_usersOnlineCacheExpirySeconds = 20;
- #region IRegionModuleBase Members
+ #region Region Module interfaceBase Members
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index b9b4413..856e4e2 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
private bool m_debugEnabled = false;
private int m_levelGroupCreate = 0;
- #region IRegionModuleBase Members
+ #region Region Module interfaceBase Members
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 5d57f70..5c7a3ac 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// private IUserAccountService m_accountService = null;
- #region IRegionModuleBase Members
+ #region Region Module interfaceBase Members
public string Name
{
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index d412cd1..cfc26a0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
private Dictionary> m_groupsAgentsDroppedFromChatSession = new Dictionary>();
private Dictionary> m_groupsAgentsInvitedToChatSession = new Dictionary>();
- #region IRegionModuleBase Members
+ #region Region Module interfaceBase Members
public string Name
{
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index 732c28f..e68764a 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
private Dictionary m_JsonValueStore;
private UUID m_sharedStore;
-#region IRegionModule Members
+#region Region Module interface
// -----------------------------------------------------------------
///
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 6910d14..0c175ca 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
private IScriptModuleComms m_comms;
private IJsonStoreModule m_store;
-#region IRegionModule Members
+#region Region Module interface
// -----------------------------------------------------------------
///
diff --git a/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs b/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
index 74c5139..78c870a 100644
--- a/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Freeswitch
private IConfigSource m_Config;
bool m_Registered = false;
- #region IRegionModule interface
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index 6ebdf4d..3d0b9fb 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
#endregion
- #region IRegionModule Members
+ #region Region Module interface
public void Initialise(IConfigSource config)
{
@@ -200,7 +200,6 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
public void AddRegion(Scene scene)
{
m_scene = scene;
- //m_scene.RegisterModuleInterface(this);
m_scene.RegisterModuleCommander(m_commander);
m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
--
cgit v1.1
From e41374dd014721a01b8850d1dcf5f486a50f3b44 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Nov 2012 22:25:35 +0000
Subject: Remove IRegionModule support from the test setup helper
---
OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 28 +++++-----------------------
1 file changed, 5 insertions(+), 23 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index db0a7fc..c424439 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -359,28 +359,10 @@ namespace OpenSim.Tests.Common
List newModules = new List();
foreach (object module in modules)
{
-// Console.WriteLine("MODULE RAW {0}", module);
- if (module is IRegionModule)
- {
- IRegionModule m = (IRegionModule)module;
-
- foreach (Scene scene in scenes)
- {
- m.Initialise(scene, config);
- scene.AddModule(m.Name, m);
- }
-
- m.PostInitialise();
- }
- else if (module is IRegionModuleBase)
- {
- // for the new system, everything has to be initialised first,
- // shared modules have to be post-initialised, then all get an AddRegion with the scene
- IRegionModuleBase m = (IRegionModuleBase)module;
-// Console.WriteLine("MODULE {0}", m.Name);
- m.Initialise(config);
- newModules.Add(m);
- }
+ IRegionModuleBase m = (IRegionModuleBase)module;
+// Console.WriteLine("MODULE {0}", m.Name);
+ m.Initialise(config);
+ newModules.Add(m);
}
foreach (IRegionModuleBase module in newModules)
@@ -709,4 +691,4 @@ namespace OpenSim.Tests.Common
return sog;
}
}
-}
\ No newline at end of file
+}
--
cgit v1.1
From 8c130bcaf5a60fa042d8df38ba1d1e1cb328d768 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Nov 2012 22:50:28 +0000
Subject: Remove the old style module loader and all references to it
---
.../LoadRegions/LoadRegionsPlugin.cs | 3 -
OpenSim/Region/Application/OpenSim.cs | 47 +---
OpenSim/Region/Application/OpenSimBase.cs | 26 +-
OpenSim/Region/Framework/ModuleLoader.cs | 262 ---------------------
OpenSim/Region/Framework/Scenes/Scene.cs | 4 +-
OpenSim/Region/Framework/Scenes/SceneBase.cs | 80 +------
OpenSim/Region/Framework/Scenes/SceneManager.cs | 16 --
OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 +-
OpenSim/Tests/Common/Mock/TestScene.cs | 6 +-
9 files changed, 21 insertions(+), 425 deletions(-)
delete mode 100644 OpenSim/Region/Framework/ModuleLoader.cs
(limited to 'OpenSim')
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index a8a3237..fcb6991 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -136,9 +136,6 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
}
}
}
-
- m_openSim.ModuleLoader.PostInitialise();
- m_openSim.ModuleLoader.ClearCache();
}
public void Dispose()
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 2236e43..47252f6 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -757,33 +757,13 @@ namespace OpenSim
switch (cmdparams[0].ToLower())
{
case "list":
- foreach (IRegionModule irm in m_moduleLoader.GetLoadedSharedModules)
- {
- MainConsole.Instance.Output(String.Format("Shared region module: {0}", irm.Name));
- }
+ //TODO: Convert to new region modules
break;
case "unload":
- if (cmdparams.Length > 1)
- {
- foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules))
- {
- if (rm.Name.ToLower() == cmdparams[1].ToLower())
- {
- MainConsole.Instance.Output(String.Format("Unloading module: {0}", rm.Name));
- m_moduleLoader.UnloadModule(rm);
- }
- }
- }
+ //TODO: Convert to new region modules
break;
case "load":
- if (cmdparams.Length > 1)
- {
- foreach (Scene s in new ArrayList(SceneManager.Scenes))
- {
- MainConsole.Instance.Output(String.Format("Loading module: {0}", cmdparams[1]));
- m_moduleLoader.LoadRegionModules(cmdparams[1], s);
- }
- }
+ //TODO: Convert to new region modules
break;
}
}
@@ -1018,28 +998,9 @@ namespace OpenSim
break;
case "modules":
- MainConsole.Instance.Output("The currently loaded shared modules are:");
- foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)
- {
- MainConsole.Instance.Output("Shared Module: " + module.Name);
- }
-
- SceneManager.ForEachScene(
- delegate(Scene scene) {
- m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
- foreach (IRegionModule module in scene.Modules.Values)
- {
- if (!module.IsSharedModule)
- {
- m_log.Error("Region Module: " + module.Name);
- }
- }
- }
- );
-
SceneManager.ForEachScene(
delegate(Scene scene) {
- MainConsole.Instance.Output("Loaded new region modules in" + scene.RegionInfo.RegionName + " are:");
+ MainConsole.Instance.Output("Loaded region modules in" + scene.RegionInfo.RegionName + " are:");
foreach (IRegionModuleBase module in scene.RegionModules.Values)
{
Type type = module.GetType().GetInterface("ISharedRegionModule");
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 7b591a8..a3d6820 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -127,14 +127,6 @@ namespace OpenSim
get { return m_httpServerPort; }
}
- public ModuleLoader ModuleLoader
- {
- get { return m_moduleLoader; }
- set { m_moduleLoader = value; }
- }
-
- protected ModuleLoader m_moduleLoader;
-
protected IRegistryCore m_applicationRegistry = new RegistryCore();
public IRegistryCore ApplicationRegistry
@@ -223,9 +215,6 @@ namespace OpenSim
base.StartupSpecific();
- // Create a ModuleLoader instance
- m_moduleLoader = new ModuleLoader(m_config.Source);
-
LoadPlugins();
foreach (IApplicationPlugin plugin in m_plugins)
{
@@ -370,12 +359,6 @@ namespace OpenSim
m_log.Info("[MODULES]: Loading Region's modules (old style)");
- List modules = m_moduleLoader.PickupModules(scene, ".");
-
- // This needs to be ahead of the script engine load, so the
- // script module can pick up events exposed by a module
- m_moduleLoader.InitialiseSharedModules(scene);
-
// Use this in the future, the line above will be deprecated soon
m_log.Info("[REGIONMODULES]: Loading Region's modules (new style)");
IRegionModulesController controller;
@@ -426,13 +409,6 @@ namespace OpenSim
clientServer.Start();
}
- if (do_post_init)
- {
- foreach (IRegionModule module in modules)
- {
- module.PostInitialise();
- }
- }
scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); };
mscene = scene;
@@ -722,7 +698,7 @@ namespace OpenSim
return new Scene(
regionInfo, circuitManager, sceneGridService,
- simDataService, estateDataService, m_moduleLoader, false,
+ simDataService, estateDataService, false,
m_config.Source, m_version);
}
diff --git a/OpenSim/Region/Framework/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs
deleted file mode 100644
index 14ecd44..0000000
--- a/OpenSim/Region/Framework/ModuleLoader.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Framework
-{
- public class ModuleLoader
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- public Dictionary LoadedAssemblys = new Dictionary();
-
- private readonly List m_loadedModules = new List();
- private readonly Dictionary m_loadedSharedModules = new Dictionary();
- private readonly IConfigSource m_config;
-
- public ModuleLoader(IConfigSource config)
- {
- m_config = config;
- }
-
- public IRegionModule[] GetLoadedSharedModules
- {
- get
- {
- IRegionModule[] regionModules = new IRegionModule[m_loadedSharedModules.Count];
- m_loadedSharedModules.Values.CopyTo(regionModules, 0);
- return regionModules;
- }
- }
-
- public List PickupModules(Scene scene, string moduleDir)
- {
- DirectoryInfo dir = new DirectoryInfo(moduleDir);
- List modules = new List();
-
- foreach (FileInfo fileInfo in dir.GetFiles("*.dll"))
- {
- modules.AddRange(LoadRegionModules(fileInfo.FullName, scene));
- }
- return modules;
- }
-
- public void LoadDefaultSharedModule(IRegionModule module)
- {
- if (m_loadedSharedModules.ContainsKey(module.Name))
- {
- m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module not added!", module.Name);
- }
- else
- {
- m_loadedSharedModules.Add(module.Name, module);
- }
- }
-
-
- public void InitialiseSharedModules(Scene scene)
- {
- foreach (IRegionModule module in m_loadedSharedModules.Values)
- {
- module.Initialise(scene, m_config);
- scene.AddModule(module.Name, module); //should be doing this?
- }
- }
-
- public void InitializeModule(IRegionModule module, Scene scene)
- {
- module.Initialise(scene, m_config);
- scene.AddModule(module.Name, module);
- m_loadedModules.Add(module);
- }
-
- ///
- /// Loads/initialises a Module instance that can be used by multiple Regions
- ///
- ///
- ///
- public void LoadSharedModule(string dllName, string moduleName)
- {
- IRegionModule module = LoadModule(dllName, moduleName);
-
- if (module != null)
- LoadSharedModule(module);
- }
-
- ///
- /// Loads/initialises a Module instance that can be used by multiple Regions
- ///
- ///
- public void LoadSharedModule(IRegionModule module)
- {
- if (!m_loadedSharedModules.ContainsKey(module.Name))
- {
- m_loadedSharedModules.Add(module.Name, module);
- }
- }
-
- public List LoadRegionModules(string dllName, Scene scene)
- {
- IRegionModule[] modules = LoadModules(dllName);
- List initializedModules = new List();
-
- if (modules.Length > 0)
- {
- m_log.InfoFormat("[MODULES]: Found Module Library [{0}]", dllName);
- foreach (IRegionModule module in modules)
- {
- if (!module.IsSharedModule)
- {
- m_log.InfoFormat("[MODULES]: [{0}]: Initializing.", module.Name);
- InitializeModule(module, scene);
- initializedModules.Add(module);
- }
- else
- {
- m_log.InfoFormat("[MODULES]: [{0}]: Loading Shared Module.", module.Name);
- LoadSharedModule(module);
- }
- }
- }
- return initializedModules;
- }
-
- public void LoadRegionModule(string dllName, string moduleName, Scene scene)
- {
- IRegionModule module = LoadModule(dllName, moduleName);
- if (module != null)
- {
- InitializeModule(module, scene);
- }
- }
-
- ///
- /// Loads a external Module (if not already loaded) and creates a new instance of it.
- ///
- ///
- ///
- public IRegionModule LoadModule(string dllName, string moduleName)
- {
- IRegionModule[] modules = LoadModules(dllName);
-
- foreach (IRegionModule module in modules)
- {
- if ((module != null) && (module.Name == moduleName))
- {
- return module;
- }
- }
-
- return null;
- }
-
- public IRegionModule[] LoadModules(string dllName)
- {
- //m_log.DebugFormat("[MODULES]: Looking for modules in {0}", dllName);
-
- List modules = new List();
-
- Assembly pluginAssembly;
- if (!LoadedAssemblys.TryGetValue(dllName, out pluginAssembly))
- {
- try
- {
- pluginAssembly = Assembly.LoadFrom(dllName);
- LoadedAssemblys.Add(dllName, pluginAssembly);
- }
- catch (BadImageFormatException)
- {
- //m_log.InfoFormat("[MODULES]: The file [{0}] is not a module assembly.", e.FileName);
- }
- }
-
- if (pluginAssembly != null)
- {
- try
- {
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (pluginType.IsPublic)
- {
- if (!pluginType.IsAbstract)
- {
- if (pluginType.GetInterface("IRegionModule") != null)
- {
- modules.Add((IRegionModule)Activator.CreateInstance(pluginType));
- }
- }
- }
- }
- }
- catch (Exception e)
- {
- m_log.ErrorFormat(
- "[MODULES]: Could not load types for plugin DLL {0}. Exception {1} {2}",
- pluginAssembly.FullName, e.Message, e.StackTrace);
-
- // justincc: Right now this is fatal to really get the user's attention
- throw e;
- }
- }
-
- return modules.ToArray();
- }
-
- public void PostInitialise()
- {
- foreach (IRegionModule module in m_loadedSharedModules.Values)
- {
- module.PostInitialise();
- }
-
- foreach (IRegionModule module in m_loadedModules)
- {
- module.PostInitialise();
- }
- }
-
- public void ClearCache()
- {
- LoadedAssemblys.Clear();
- }
-
- public void UnloadModule(IRegionModule rm)
- {
- rm.Close();
-
- m_loadedModules.Remove(rm);
- }
- }
-}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 69c1027..db45d6b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -176,7 +176,6 @@ namespace OpenSim.Region.Framework.Scenes
protected List m_regionRestartNotifyList = new List();
protected List m_neighbours = new List();
protected string m_simulatorVersion = "OpenSimulator Server";
- protected ModuleLoader m_moduleLoader;
protected AgentCircuitManager m_authenticateHandler;
protected SceneCommunicationService m_sceneGridService;
@@ -659,7 +658,7 @@ namespace OpenSim.Region.Framework.Scenes
public Scene(RegionInfo regInfo, AgentCircuitManager authen,
SceneCommunicationService sceneGridService,
ISimulationDataService simDataService, IEstateDataService estateDataService,
- ModuleLoader moduleLoader, bool dumpAssetsToFile,
+ bool dumpAssetsToFile,
IConfigSource config, string simulatorVersion)
: this(regInfo)
{
@@ -670,7 +669,6 @@ namespace OpenSim.Region.Framework.Scenes
Random random = new Random();
m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue / 2)) + (uint)(uint.MaxValue / 4);
- m_moduleLoader = moduleLoader;
m_authenticateHandler = authen;
m_sceneGridService = sceneGridService;
m_SimulationDataService = simDataService;
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index b87a38a..d3e968e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -67,12 +67,6 @@ namespace OpenSim.Region.Framework.Scenes
///
/// All the region modules attached to this scene.
///
- public Dictionary Modules
- {
- get { return m_modules; }
- }
- protected Dictionary m_modules = new Dictionary();
-
public Dictionary RegionModules
{
get { return m_regionModules; }
@@ -272,16 +266,6 @@ namespace OpenSim.Region.Framework.Scenes
///
public virtual void Close()
{
- // Shut down all non shared modules.
- foreach (IRegionModule module in Modules.Values)
- {
- if (!module.IsSharedModule)
- {
- module.Close();
- }
- }
- Modules.Clear();
-
try
{
EventManager.TriggerShutdown();
@@ -312,19 +296,6 @@ namespace OpenSim.Region.Framework.Scenes
#region Module Methods
///
- /// Add a module to this scene.
- ///
- ///
- ///
- public void AddModule(string name, IRegionModule module)
- {
- if (!Modules.ContainsKey(name))
- {
- Modules.Add(name, module);
- }
- }
-
- ///
/// Add a region-module to this scene. TODO: This will replace AddModule in the future.
///
///
@@ -508,9 +479,9 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
- public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback)
+ public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
{
- AddCommand(mod, command, shorthelp, longhelp, string.Empty, callback);
+ AddCommand(module, command, shorthelp, longhelp, string.Empty, callback);
}
///
@@ -528,9 +499,9 @@ namespace OpenSim.Region.Framework.Scenes
///
///
public void AddCommand(
- string category, object mod, string command, string shorthelp, string longhelp, CommandDelegate callback)
+ string category, IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
{
- AddCommand(category, mod, command, shorthelp, longhelp, string.Empty, callback);
+ AddCommand(category, module, command, shorthelp, longhelp, string.Empty, callback);
}
///
@@ -542,29 +513,14 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
- public void AddCommand(object mod, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
+ public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
{
string moduleName = "";
- if (mod != null)
- {
- if (mod is IRegionModule)
- {
- IRegionModule module = (IRegionModule)mod;
- moduleName = module.Name;
- }
- else if (mod is IRegionModuleBase)
- {
- IRegionModuleBase module = (IRegionModuleBase)mod;
- moduleName = module.Name;
- }
- else
- {
- throw new Exception("AddCommand module parameter must be IRegionModule or IRegionModuleBase");
- }
- }
+ if (module != null)
+ moduleName = module.Name;
- AddCommand(moduleName, mod, command, shorthelp, longhelp, descriptivehelp, callback);
+ AddCommand(moduleName, module, command, shorthelp, longhelp, descriptivehelp, callback);
}
///
@@ -580,7 +536,7 @@ namespace OpenSim.Region.Framework.Scenes
///
///
public void AddCommand(
- string category, object mod, string command,
+ string category, IRegionModuleBase module, string command,
string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
{
if (MainConsole.Instance == null)
@@ -588,22 +544,8 @@ namespace OpenSim.Region.Framework.Scenes
bool shared = false;
- if (mod != null)
- {
- if (mod is IRegionModule)
- {
- IRegionModule module = (IRegionModule)mod;
- shared = module.IsSharedModule;
- }
- else if (mod is IRegionModuleBase)
- {
- shared = mod is ISharedRegionModule;
- }
- else
- {
- throw new Exception("AddCommand module parameter must be IRegionModule or IRegionModuleBase");
- }
- }
+ if (module != null)
+ shared = module is ISharedRegionModule;
MainConsole.Instance.Commands.AddCommand(
category, shared, command, shorthelp, longhelp, descriptivehelp, callback);
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index cb5b2ba..992e71d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -144,22 +144,6 @@ namespace OpenSim.Region.Framework.Scenes
// collect known shared modules in sharedModules
Dictionary sharedModules = new Dictionary();
- lock (m_localScenes)
- {
- for (int i = 0; i < m_localScenes.Count; i++)
- {
- // extract known shared modules from scene
- foreach (string k in m_localScenes[i].Modules.Keys)
- {
- if (m_localScenes[i].Modules[k].IsSharedModule &&
- !sharedModules.ContainsKey(k))
- sharedModules[k] = m_localScenes[i].Modules[k];
- }
- // close scene/region
- m_localScenes[i].Close();
- }
- }
-
// all regions/scenes are now closed, we can now safely
// close all shared modules
foreach (IRegionModule mod in sharedModules.Values)
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index c424439..939fc33 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Tests.Common
SceneCommunicationService scs = new SceneCommunicationService();
TestScene testScene = new TestScene(
- regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null);
+ regInfo, m_acm, scs, m_simDataService, m_estateDataService, false, configSource, null);
INonSharedRegionModule godsModule = new GodsModule();
godsModule.Initialise(new IniConfigSource());
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index eea68c3..d4b5648 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -41,9 +41,9 @@ namespace OpenSim.Tests.Common.Mock
public TestScene(
RegionInfo regInfo, AgentCircuitManager authen,
SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
- ModuleLoader moduleLoader, bool dumpAssetsToFile,
+ bool dumpAssetsToFile,
IConfigSource config, string simulatorVersion)
- : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader,
+ : base(regInfo, authen, sceneGridService, simDataService, estateDataService,
dumpAssetsToFile, config, simulatorVersion)
{
}
@@ -73,4 +73,4 @@ namespace OpenSim.Tests.Common.Mock
get { return m_asyncSceneObjectDeleter; }
}
}
-}
\ No newline at end of file
+}
--
cgit v1.1
From faca7559959db6914b2c82d816f038be5c1fbb9f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Nov 2012 22:51:24 +0000
Subject: Stop closing old style modules
---
OpenSim/Region/Framework/Scenes/SceneManager.cs | 9 ---------
1 file changed, 9 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 992e71d..9bd27d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -141,15 +141,6 @@ namespace OpenSim.Region.Framework.Scenes
public void Close()
{
- // collect known shared modules in sharedModules
- Dictionary sharedModules = new Dictionary();
-
- // all regions/scenes are now closed, we can now safely
- // close all shared modules
- foreach (IRegionModule mod in sharedModules.Values)
- {
- mod.Close();
- }
}
public void Close(Scene cscene)
--
cgit v1.1
From 4edaa4e41a03109ff5db903da532fde7c26fccd3 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Nov 2012 22:56:59 +0000
Subject: Completely remove the IRegionModule interface
---
.../Region/Framework/Interfaces/IRegionModule.cs | 55 ----------------------
1 file changed, 55 deletions(-)
delete mode 100644 OpenSim/Region/Framework/Interfaces/IRegionModule.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
deleted file mode 100644
index aacc26b..0000000
--- a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-
-using Nini.Config;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Framework.Interfaces
-{
- ///
- /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead
- ///
- [Obsolete("Use INonSharedRegionModule or ISharedRegionModule instead", false)]
- public interface IRegionModule
- {
- ///
- /// Initialize the module.
- ///
- ///
- /// For a shared module this can be called multiple times - once per scene.
- ///
- ///
- /// Configuration information. For a shared module this will be identical on every scene call
- void Initialise(Scene scene, IConfigSource source);
-
- void PostInitialise();
- void Close();
- string Name { get; }
- bool IsSharedModule { get; }
- }
-}
--
cgit v1.1