aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-10 20:17:13 +0000
committerMelanie Thielker2009-07-10 20:17:13 +0000
commit8ecfc9a717c259fd238312888f6178b3f86c008a (patch)
treea05601b3c0218f3e797f4a2104e362a964522c7b /OpenSim
parent* minor: formatting adjustments in OpenSim.ini.example (diff)
downloadopensim-SC-8ecfc9a717c259fd238312888f6178b3f86c008a.zip
opensim-SC-8ecfc9a717c259fd238312888f6178b3f86c008a.tar.gz
opensim-SC-8ecfc9a717c259fd238312888f6178b3f86c008a.tar.bz2
opensim-SC-8ecfc9a717c259fd238312888f6178b3f86c008a.tar.xz
Committing the interface change and the addition to the modules to get
the ball rolling on replacable modules. No user functionality yet
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Client/Linden/LLClientStackModule.cs5
-rw-r--r--OpenSim/Client/Linden/LLProxyLoginModule.cs5
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs5
-rw-r--r--OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs5
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs5
-rw-r--r--OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs5
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs6
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs5
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs14
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs5
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs5
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs5
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
37 files changed, 195 insertions, 0 deletions
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
110 110
111 } 111 }
112 112
113 public Type ReplacableInterface
114 {
115 get { return null; }
116 }
117
113 public string Name 118 public string Name
114 { 119 {
115 get { return "LLClientStackModule"; } 120 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
125 125
126 } 126 }
127 127
128 public Type ReplacableInterface
129 {
130 get { return null; }
131 }
132
128 public string Name 133 public string Name
129 { 134 {
130 get { return "LLProxyLoginModule"; } 135 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
155 } 155 }
156 } 156 }
157 157
158 public Type ReplacableInterface
159 {
160 get { return null; }
161 }
162
158 public string Name 163 public string Name
159 { 164 {
160 get { return "LLStandaloneLoginModule"; } 165 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
81 get { return "Capabilities Module"; } 81 get { return "Capabilities Module"; }
82 } 82 }
83 83
84 public Type ReplacableInterface
85 {
86 get { return null; }
87 }
88
84 public void AddCapsHandler(UUID agentId) 89 public void AddCapsHandler(UUID agentId)
85 { 90 {
86 if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId)) 91 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
290 get { return "CenomeMemoryAssetCache"; } 290 get { return "CenomeMemoryAssetCache"; }
291 } 291 }
292 292
293 public Type ReplacableInterface
294 {
295 get { return null; }
296 }
297
293 /// <summary> 298 /// <summary>
294 /// New region is being added to server. 299 /// New region is being added to server.
295 /// </summary> 300 /// </summary>
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
54 get { return "CoreAssetCache"; } 54 get { return "CoreAssetCache"; }
55 } 55 }
56 56
57 public Type ReplacableInterface
58 {
59 get { return null; }
60 }
61
57 public void Initialise(IConfigSource source) 62 public void Initialise(IConfigSource source)
58 { 63 {
59 IConfig moduleConfig = source.Configs["Modules"]; 64 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
146 m_InvalidChars.AddRange(Path.GetInvalidFileNameChars()); 146 m_InvalidChars.AddRange(Path.GetInvalidFileNameChars());
147 } 147 }
148 148
149 public Type ReplacableInterface
150 {
151 get { return null; }
152 }
153
149 public string Name 154 public string Name
150 { 155 {
151 get { return m_ModuleName; } 156 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
51 // Instrumentation 51 // Instrumentation
52 private uint m_DebugRate = 0; 52 private uint m_DebugRate = 0;
53 53
54 public Type ReplacableInterface
55 {
56 get { return null; }
57 }
58
54 public string Name 59 public string Name
55 { 60 {
56 get { return "GlynnTuckerAssetCache"; } 61 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
125 { 125 {
126 } 126 }
127 127
128 public Type ReplacableInterface
129 {
130 get { return null; }
131 }
132
128 public virtual string Name 133 public virtual string Name
129 { 134 {
130 get { return "ChatModule"; } 135 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
74 74
75 private IHttpServer m_HttpServer = null; 75 private IHttpServer m_HttpServer = null;
76 76
77 public Type ReplacableInterface
78 {
79 get { return null; }
80 }
81
77 public string Name 82 public string Name
78 { 83 {
79 get { return "UrlModule"; } 84 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
77 { 77 {
78 } 78 }
79 79
80 public Type ReplacableInterface
81 {
82 get { return null; }
83 }
84
80 public string Name 85 public string Name
81 { 86 {
82 get { return "RegionAssetService"; } 87 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
81 { 81 {
82 } 82 }
83 83
84 public Type ReplacableInterface
85 {
86 get { return null; }
87 }
88
84 public string Name 89 public string Name
85 { 90 {
86 get { return "HGAuthServiceInConnectorModule"; } 91 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
77 { 77 {
78 } 78 }
79 79
80 public Type ReplacableInterface
81 {
82 get { return null; }
83 }
84
80 public string Name 85 public string Name
81 { 86 {
82 get { return "RegionInventoryService"; } 87 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
81 { 81 {
82 } 82 }
83 83
84 public Type ReplacableInterface
85 {
86 get { return null; }
87 }
88
84 public string Name 89 public string Name
85 { 90 {
86 get { return "LandServiceInConnectorModule"; } 91 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
81 { 81 {
82 } 82 }
83 83
84 public Type ReplacableInterface
85 {
86 get { return null; }
87 }
88
84 public string Name 89 public string Name
85 { 90 {
86 get { return "NeighbourServiceInConnectorModule"; } 91 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
77 { 77 {
78 } 78 }
79 79
80 public Type ReplacableInterface
81 {
82 get { return null; }
83 }
84
80 public string Name 85 public string Name
81 { 86 {
82 get { return "SimulationService"; } 87 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
52 52
53 private bool m_Enabled = false; 53 private bool m_Enabled = false;
54 54
55 public Type ReplacableInterface
56 {
57 get { return null; }
58 }
59
55 public string Name 60 public string Name
56 { 61 {
57 get { return "HGAssetBroker"; } 62 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
51 51
52 private bool m_Enabled = false; 52 private bool m_Enabled = false;
53 53
54 public Type ReplacableInterface
55 {
56 get { return null; }
57 }
58
54 public string Name 59 public string Name
55 { 60 {
56 get { return "LocalAssetServicesConnector"; } 61 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
48 private bool m_Enabled = false; 48 private bool m_Enabled = false;
49 private IImprovedAssetCache m_Cache; 49 private IImprovedAssetCache m_Cache;
50 50
51 public Type ReplacableInterface
52 {
53 get { return null; }
54 }
55
51 public string Name 56 public string Name
52 { 57 {
53 get { return "RemoteAssetServicesConnector"; } 58 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
56 private ISessionAuthInventoryService m_HGService; 56 private ISessionAuthInventoryService m_HGService;
57 57
58 private string m_LocalGridInventoryURI = string.Empty; 58 private string m_LocalGridInventoryURI = string.Empty;
59 public Type ReplacableInterface
60 {
61 get { return null; }
62 }
63
59 public string Name 64 public string Name
60 { 65 {
61 get { return "HGInventoryBroker"; } 66 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
53 private bool m_Enabled = false; 53 private bool m_Enabled = false;
54 private bool m_Initialized = false; 54 private bool m_Initialized = false;
55 55
56 public Type ReplacableInterface
57 {
58 get { return null; }
59 }
60
56 public string Name 61 public string Name
57 { 62 {
58 get { return "LocalInventoryServicesConnector"; } 63 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
50 private Scene m_Scene; 50 private Scene m_Scene;
51 private InventoryServicesConnector m_RemoteConnector; 51 private InventoryServicesConnector m_RemoteConnector;
52 52
53 public Type ReplacableInterface
54 {
55 get { return null; }
56 }
57
53 public string Name 58 public string Name
54 { 59 {
55 get { return "RemoteInventoryServicesConnector"; } 60 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
60 60
61 #region ISharedRegionModule 61 #region ISharedRegionModule
62 62
63 public Type ReplacableInterface
64 {
65 get { return null; }
66 }
67
63 public string Name 68 public string Name
64 { 69 {
65 get { return "LocalLandServicesConnector"; } 70 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
49 private bool m_Enabled = false; 49 private bool m_Enabled = false;
50 private LocalLandServicesConnector m_LocalService; 50 private LocalLandServicesConnector m_LocalService;
51 51
52 public Type ReplacableInterface
53 {
54 get { return null; }
55 }
56
52 public string Name 57 public string Name
53 { 58 {
54 get { return "RemoteLandServicesConnector"; } 59 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
60 60
61 #region ISharedRegionModule 61 #region ISharedRegionModule
62 62
63 public Type ReplacableInterface
64 {
65 get { return null; }
66 }
67
63 public string Name 68 public string Name
64 { 69 {
65 get { return "LocalNeighbourServicesConnector"; } 70 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
51 private string serviceDll; 51 private string serviceDll;
52 private List<Scene> m_Scenes = new List<Scene>(); 52 private List<Scene> m_Scenes = new List<Scene>();
53 53
54 public Type ReplacableInterface
55 {
56 get { return null; }
57 }
58
54 public string Name 59 public string Name
55 { 60 {
56 get { return "RemoteNeighbourServicesConnector"; } 61 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
46 46
47 private bool m_Enabled = false; 47 private bool m_Enabled = false;
48 48
49 public Type ReplacableInterface
50 {
51 get { return null; }
52 }
53
49 public string Name 54 public string Name
50 { 55 {
51 get { return "LocalUserServicesConnector"; } 56 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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using Nini.Config; 29using Nini.Config;
29using log4net; 30using log4net;
30using System.Reflection; 31using System.Reflection;
@@ -44,6 +45,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
44 45
45 private bool m_Enabled = false; 46 private bool m_Enabled = false;
46 47
48 public Type ReplacableInterface
49 {
50 get { return null; }
51 }
52
47 public string Name 53 public string Name
48 { 54 {
49 get { return "RemoteUserServicesConnector"; } 55 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
159 { 159 {
160 } 160 }
161 161
162 public Type ReplacableInterface
163 {
164 get { return null; }
165 }
166
162 public string Name 167 public string Name
163 { 168 {
164 get { return "TerrainModule"; } 169 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
128 { 128 {
129 } 129 }
130 130
131 public Type ReplacableInterface
132 {
133 get { return null; }
134 }
135
131 public virtual string Name 136 public virtual string Name
132 { 137 {
133 get { return "WorldMapModule"; } 138 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
40 string Name { get; } 40 string Name { get; }
41 41
42 /// <summary> 42 /// <summary>
43 /// If this returns non-null, it is the type of an interface that
44 /// this module intends to register.
45 /// This will cause the loader to defer loading of this module
46 /// until all other modules have been loaded. If no other module
47 /// has registered the interface by then, this module will be
48 /// activated, else it will remain inactive, letting the other module
49 /// take over. This should return non-null ONLY in modules that are
50 /// intended to be easily replacable, e.g. stub implementations
51 /// that the developer expects to be replaced by third party provided
52 /// modules.
53 /// </summary>
54 Type ReplacableInterface { get; }
55
56 /// <summary>
43 /// This is called to initialize the region module. For shared modules, this is called 57 /// This is called to initialize the region module. For shared modules, this is called
44 /// exactly once, after creating the single (shared) instance. For non-shared modules, 58 /// exactly once, after creating the single (shared) instance. For non-shared modules,
45 /// this is called once on each instance, after the instace for the region has been created. 59 /// 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
54 54
55 #region INonSharedRegionModule Members 55 #region INonSharedRegionModule Members
56 56
57 public Type ReplacableInterface
58 {
59 get { return null; }
60 }
61
57 public string Name 62 public string Name
58 { 63 {
59 get { return "IRCBridgeModule"; } 64 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
214 { 214 {
215 } 215 }
216 216
217 public Type ReplacableInterface
218 {
219 get { return null; }
220 }
221
217 public override string Name 222 public override string Name
218 { 223 {
219 get { return "ConciergeModule"; } 224 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
177 m_msgTransferModule = null; 177 m_msgTransferModule = null;
178 } 178 }
179 179
180 public Type ReplacableInterface
181 {
182 get { return null; }
183 }
184
180 public string Name 185 public string Name
181 { 186 {
182 get { return "XmlRpcGroupsMessaging"; } 187 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
222 m_clientRequestIDFlushTimer.Stop(); 222 m_clientRequestIDFlushTimer.Stop();
223 } 223 }
224 224
225 public Type ReplacableInterface
226 {
227 get { return null; }
228 }
229
225 public string Name 230 public string Name
226 { 231 {
227 get { return "XmlRpcGroupsModule"; } 232 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
207 { 207 {
208 } 208 }
209 209
210 public Type ReplacableInterface
211 {
212 get { return null; }
213 }
214
210 public string Name 215 public string Name
211 { 216 {
212 get { return "Common." + ScriptEngineName; } 217 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
402 return 0; 402 return 0;
403 } 403 }
404 404
405 public Type ReplacableInterface
406 {
407 get { return null; }
408 }
409
405 public string Name 410 public string Name
406 { 411 {
407 get { return "XEngine"; } 412 get { return "XEngine"; }