From 8ecfc9a717c259fd238312888f6178b3f86c008a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 10 Jul 2009 20:17:13 +0000
Subject: Committing the interface change and the addition to the modules to
get the ball rolling on replacable modules. No user functionality yet
---
OpenSim/Client/Linden/LLClientStackModule.cs | 5 +++++
OpenSim/Client/Linden/LLProxyLoginModule.cs | 5 +++++
OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 5 +++++
.../CoreModules/Agent/Capabilities/CapabilitiesModule.cs | 5 +++++
OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 5 +++++
OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 5 +++++
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 5 +++++
OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs | 5 +++++
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 5 +++++
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 5 +++++
.../Asset/AssetServiceInConnectorModule.cs | 5 +++++
.../Authentication/HGAuthServiceInConnectorModule.cs | 5 +++++
.../Inventory/InventoryServiceInConnectorModule.cs | 5 +++++
.../Land/LandServiceInConnectorModule.cs | 5 +++++
.../Neighbour/NeighbourServiceInConnectorModule.cs | 5 +++++
.../Simulation/SimulationServiceInConnectorModule.cs | 5 +++++
.../ServiceConnectorsOut/Asset/HGAssetBroker.cs | 5 +++++
.../Asset/LocalAssetServiceConnector.cs | 5 +++++
.../Asset/RemoteAssetServiceConnector.cs | 5 +++++
.../ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 5 +++++
.../Inventory/LocalInventoryServiceConnector.cs | 5 +++++
.../Inventory/RemoteInventoryServiceConnector.cs | 5 +++++
.../ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | 5 +++++
.../Land/RemoteLandServiceConnector.cs | 5 +++++
.../Neighbour/LocalNeighbourServiceConnector.cs | 5 +++++
.../Neighbour/RemoteNeighourServiceConnector.cs | 5 +++++
.../ServiceConnectorsOut/User/LocalUserServiceConnector.cs | 5 +++++
.../User/RemoteUserServiceConnector.cs | 6 ++++++
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 5 +++++
.../Region/CoreModules/World/WorldMap/WorldMapModule.cs | 5 +++++
OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs | 14 ++++++++++++++
.../Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs | 5 +++++
.../OptionalModules/Avatar/Concierge/ConciergeModule.cs | 5 +++++
.../Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs | 5 +++++
.../Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs | 5 +++++
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 5 +++++
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 +++++
37 files changed, 195 insertions(+)
diff --git a/OpenSim/Client/Linden/LLClientStackModule.cs b/OpenSim/Client/Linden/LLClientStackModule.cs
index 74612bb..09177f6 100644
--- a/OpenSim/Client/Linden/LLClientStackModule.cs
+++ b/OpenSim/Client/Linden/LLClientStackModule.cs
@@ -110,6 +110,11 @@ namespace OpenSim.Client.Linden
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LLClientStackModule"; }
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index f7608d1..0e4b549 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -125,6 +125,11 @@ namespace OpenSim.Client.Linden
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LLProxyLoginModule"; }
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index 21197f8..dde5fb0 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -155,6 +155,11 @@ namespace OpenSim.Client.Linden
}
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LLStandaloneLoginModule"; }
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 0c7882a..a65262f 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
get { return "Capabilities Module"; }
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public void AddCapsHandler(UUID agentId)
{
if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 0d73296..5ce8cd0 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -290,6 +290,11 @@ namespace OpenSim.Region.CoreModules.Asset
get { return "CenomeMemoryAssetCache"; }
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
///
/// New region is being added to server.
///
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 0ae206d..445a469 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -54,6 +54,11 @@ namespace OpenSim.Region.CoreModules.Asset
get { return "CoreAssetCache"; }
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["Modules"];
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 6ea9e27..9a165fb 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -146,6 +146,11 @@ namespace Flotsam.RegionModules.AssetCache
m_InvalidChars.AddRange(Path.GetInvalidFileNameChars());
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return m_ModuleName; }
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index d3a5006..cea5dd6 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -51,6 +51,11 @@ namespace OpenSim.Region.CoreModules.Asset
// Instrumentation
private uint m_DebugRate = 0;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "GlynnTuckerAssetCache"; }
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index dba6b38..9e85b11 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -125,6 +125,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public virtual string Name
{
get { return "ChatModule"; }
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 50d3fbe..7d2876c 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -74,6 +74,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
private IHttpServer m_HttpServer = null;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "UrlModule"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 3d7decc..6227cca 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -77,6 +77,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "RegionAssetService"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
index a991393..f4ebc70 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
@@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "HGAuthServiceInConnectorModule"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 0ed7464..b9c942f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -77,6 +77,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "RegionInventoryService"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 213a769..6b5b74e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LandServiceInConnectorModule"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index f283c89..e7a4e25 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "NeighbourServiceInConnectorModule"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index 9e7e10d..45f203b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -77,6 +77,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "SimulationService"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index a9e9dc2..2990299 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -52,6 +52,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "HGAssetBroker"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index 13c4b52..cda205b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -51,6 +51,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LocalAssetServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
index e554c68..a603173 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
@@ -48,6 +48,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false;
private IImprovedAssetCache m_Cache;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "RemoteAssetServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 9f6c1a2..1b3d815 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -56,6 +56,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private ISessionAuthInventoryService m_HGService;
private string m_LocalGridInventoryURI = string.Empty;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "HGInventoryBroker"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 8f04025..a304357 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -53,6 +53,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private bool m_Enabled = false;
private bool m_Initialized = false;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LocalInventoryServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 9b51da7..31f4032 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -50,6 +50,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private Scene m_Scene;
private InventoryServicesConnector m_RemoteConnector;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "RemoteInventoryServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
index 73d12e5..2b7f7e8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
@@ -60,6 +60,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
#region ISharedRegionModule
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LocalLandServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
index 27f811c..f50cef9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
@@ -49,6 +49,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
private bool m_Enabled = false;
private LocalLandServicesConnector m_LocalService;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "RemoteLandServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index f16bc46..0d4a09f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -60,6 +60,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
#region ISharedRegionModule
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LocalNeighbourServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
index dc876e3..01c95d7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
@@ -51,6 +51,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
private string serviceDll;
private List m_Scenes = new List();
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "RemoteNeighbourServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
index 1efb8f6..c8703ee 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
@@ -46,6 +46,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
private bool m_Enabled = false;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "LocalUserServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
index 2e9739b..41d360f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+using System;
using Nini.Config;
using log4net;
using System.Reflection;
@@ -44,6 +45,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
private bool m_Enabled = false;
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "RemoteUserServicesConnector"; }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 4d01f22..8c905d6 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -159,6 +159,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "TerrainModule"; }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index cf04fc8..1c7baa2 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -128,6 +128,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public virtual string Name
{
get { return "WorldMapModule"; }
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
index 3888d2c..885f1ff 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
@@ -40,6 +40,20 @@ namespace OpenSim.Region.Framework.Interfaces
string Name { get; }
///
+ /// If this returns non-null, it is the type of an interface that
+ /// this module intends to register.
+ /// This will cause the loader to defer loading of this module
+ /// until all other modules have been loaded. If no other module
+ /// has registered the interface by then, this module will be
+ /// activated, else it will remain inactive, letting the other module
+ /// take over. This should return non-null ONLY in modules that are
+ /// intended to be easily replacable, e.g. stub implementations
+ /// that the developer expects to be replaced by third party provided
+ /// modules.
+ ///
+ Type ReplacableInterface { get; }
+
+ ///
/// This is called to initialize the region module. For shared modules, this is called
/// exactly once, after creating the single (shared) instance. For non-shared modules,
/// this is called once on each instance, after the instace for the region has been created.
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index 0c696e3..d7e7a56 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -54,6 +54,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
#region INonSharedRegionModule Members
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "IRCBridgeModule"; }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 96b6888..21c0ab1 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -214,6 +214,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public override string Name
{
get { return "ConciergeModule"; }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
index 9625342..4095041 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs
@@ -177,6 +177,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_msgTransferModule = null;
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "XmlRpcGroupsMessaging"; }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
index da45177..b43a6ac 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
@@ -222,6 +222,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_clientRequestIDFlushTimer.Stop();
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "XmlRpcGroupsModule"; }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 5549ea8..ec94afa 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -207,6 +207,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
{
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "Common." + ScriptEngineName; }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 1b26391..dff53dd 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -402,6 +402,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return 0;
}
+ public Type ReplacableInterface
+ {
+ get { return null; }
+ }
+
public string Name
{
get { return "XEngine"; }
--
cgit v1.1