aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-08-10 16:02:33 -0700
committerDiva Canto2009-08-10 16:02:33 -0700
commit9f95ec499858915de3ccafa0d2b5e23bdcc0ff74 (patch)
tree6d456a3bea6952c8ac010e549a9f592017a46902 /OpenSim
parentChanged RequestRootFolder to GetRootFolder (diff)
parentReplace the Replaceable modules name (diff)
downloadopensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.zip
opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.gz
opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.bz2
opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs8
-rw-r--r--OpenSim/Client/Linden/LLClientStackModule.cs2
-rw-r--r--OpenSim/Client/Linden/LLProxyLoginModule.cs2
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs2
-rw-r--r--OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs2
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs2
-rw-r--r--OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
43 files changed, 46 insertions, 46 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 6331519..f30a18b 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -160,7 +160,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
160 List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>(); 160 List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>();
161 foreach (ISharedRegionModule module in m_sharedInstances) 161 foreach (ISharedRegionModule module in m_sharedInstances)
162 { 162 {
163 Type replaceableInterface = module.ReplacableInterface; 163 Type replaceableInterface = module.ReplaceableInterface;
164 if (replaceableInterface != null) 164 if (replaceableInterface != null)
165 { 165 {
166 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface); 166 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
@@ -190,7 +190,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
190 { 190 {
191 INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type); 191 INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type);
192 192
193 Type replaceableInterface = module.ReplacableInterface; 193 Type replaceableInterface = module.ReplaceableInterface;
194 if (replaceableInterface != null) 194 if (replaceableInterface != null)
195 { 195 {
196 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface); 196 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
@@ -226,7 +226,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
226 226
227 foreach (ISharedRegionModule module in deferredSharedModules.Values) 227 foreach (ISharedRegionModule module in deferredSharedModules.Values)
228 { 228 {
229 Type replaceableInterface = module.ReplacableInterface; 229 Type replaceableInterface = module.ReplaceableInterface;
230 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface); 230 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
231 231
232 if (mii.Invoke(scene, new object[0]) != null) 232 if (mii.Invoke(scene, new object[0]) != null)
@@ -247,7 +247,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
247 List<INonSharedRegionModule> deferredlist = new List<INonSharedRegionModule>(); 247 List<INonSharedRegionModule> deferredlist = new List<INonSharedRegionModule>();
248 foreach (INonSharedRegionModule module in deferredNonSharedModules.Values) 248 foreach (INonSharedRegionModule module in deferredNonSharedModules.Values)
249 { 249 {
250 Type replaceableInterface = module.ReplacableInterface; 250 Type replaceableInterface = module.ReplaceableInterface;
251 if (replaceableInterface != null) 251 if (replaceableInterface != null)
252 { 252 {
253 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface); 253 MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
diff --git a/OpenSim/Client/Linden/LLClientStackModule.cs b/OpenSim/Client/Linden/LLClientStackModule.cs
index 09177f6..a964989 100644
--- a/OpenSim/Client/Linden/LLClientStackModule.cs
+++ b/OpenSim/Client/Linden/LLClientStackModule.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Client.Linden
110 110
111 } 111 }
112 112
113 public Type ReplacableInterface 113 public Type ReplaceableInterface
114 { 114 {
115 get { return null; } 115 get { return null; }
116 } 116 }
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index 0e4b549..f55d9fc 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Client.Linden
125 125
126 } 126 }
127 127
128 public Type ReplacableInterface 128 public Type ReplaceableInterface
129 { 129 {
130 get { return null; } 130 get { return null; }
131 } 131 }
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index dde5fb0..4a31e95 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Client.Linden
155 } 155 }
156 } 156 }
157 157
158 public Type ReplacableInterface 158 public Type ReplaceableInterface
159 { 159 {
160 get { return null; } 160 get { return null; }
161 } 161 }
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index a65262f..56545d6 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
81 get { return "Capabilities Module"; } 81 get { return "Capabilities Module"; }
82 } 82 }
83 83
84 public Type ReplacableInterface 84 public Type ReplaceableInterface
85 { 85 {
86 get { return null; } 86 get { return null; }
87 } 87 }
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 5ce8cd0..a1e27f1 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -290,7 +290,7 @@ namespace OpenSim.Region.CoreModules.Asset
290 get { return "CenomeMemoryAssetCache"; } 290 get { return "CenomeMemoryAssetCache"; }
291 } 291 }
292 292
293 public Type ReplacableInterface 293 public Type ReplaceableInterface
294 { 294 {
295 get { return null; } 295 get { return null; }
296 } 296 }
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 445a469..2de40d2 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Asset
54 get { return "CoreAssetCache"; } 54 get { return "CoreAssetCache"; }
55 } 55 }
56 56
57 public Type ReplacableInterface 57 public Type ReplaceableInterface
58 { 58 {
59 get { return null; } 59 get { return null; }
60 } 60 }
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 03b06f5..c7723f1 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -159,7 +159,7 @@ namespace Flotsam.RegionModules.AssetCache
159 m_InvalidChars.AddRange(Path.GetInvalidFileNameChars()); 159 m_InvalidChars.AddRange(Path.GetInvalidFileNameChars());
160 } 160 }
161 161
162 public Type ReplacableInterface 162 public Type ReplaceableInterface
163 { 163 {
164 get { return null; } 164 get { return null; }
165 } 165 }
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index cea5dd6..8d8e0fe 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -51,7 +51,7 @@ 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 54 public Type ReplaceableInterface
55 { 55 {
56 get { return null; } 56 get { return null; }
57 } 57 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 9e85b11..fcc2673 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
125 { 125 {
126 } 126 }
127 127
128 public Type ReplacableInterface 128 public Type ReplaceableInterface
129 { 129 {
130 get { return null; } 130 get { return null; }
131 } 131 }
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index ad42523..6a2a6c8 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -74,7 +74,7 @@ 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 77 public Type ReplaceableInterface
78 { 78 {
79 get { return null; } 79 get { return null; }
80 } 80 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 6227cca..bb9a4b2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
77 { 77 {
78 } 78 }
79 79
80 public Type ReplacableInterface 80 public Type ReplaceableInterface
81 { 81 {
82 get { return null; } 82 get { return null; }
83 } 83 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index b9c942f..c326818 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
77 { 77 {
78 } 78 }
79 79
80 public Type ReplacableInterface 80 public Type ReplaceableInterface
81 { 81 {
82 get { return null; } 82 get { return null; }
83 } 83 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 6b5b74e..20671e0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
81 { 81 {
82 } 82 }
83 83
84 public Type ReplacableInterface 84 public Type ReplaceableInterface
85 { 85 {
86 get { return null; } 86 get { return null; }
87 } 87 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index e7a4e25..a31ce8e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
81 { 81 {
82 } 82 }
83 83
84 public Type ReplacableInterface 84 public Type ReplaceableInterface
85 { 85 {
86 get { return null; } 86 get { return null; }
87 } 87 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index 45f203b..f28a318 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
77 { 77 {
78 } 78 }
79 79
80 public Type ReplacableInterface 80 public Type ReplaceableInterface
81 { 81 {
82 get { return null; } 82 get { return null; }
83 } 83 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 2990299..621e9d2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -52,7 +52,7 @@ 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 55 public Type ReplaceableInterface
56 { 56 {
57 get { return null; } 57 get { return null; }
58 } 58 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index cda205b..b13a116 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -51,7 +51,7 @@ 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 54 public Type ReplaceableInterface
55 { 55 {
56 get { return null; } 56 get { return null; }
57 } 57 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
index a603173..4eff60e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
@@ -48,7 +48,7 @@ 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 51 public Type ReplaceableInterface
52 { 52 {
53 get { return null; } 53 get { return null; }
54 } 54 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
index 712a12b..ee809bd 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
92 { 92 {
93 } 93 }
94 94
95 public Type ReplacableInterface 95 public Type ReplaceableInterface
96 { 96 {
97 get { return null; } 97 get { return null; }
98 } 98 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
index fd5ccee..9519e23 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
113 } 113 }
114 } 114 }
115 115
116 public Type ReplacableInterface 116 public Type ReplaceableInterface
117 { 117 {
118 get { return null; } 118 get { return null; }
119 } 119 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 16466b0..b3c5396 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -56,7 +56,7 @@ 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 59 public Type ReplaceableInterface
60 { 60 {
61 get { return null; } 61 get { return null; }
62 } 62 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 41a0e43..cb20f35 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
52 private bool m_Enabled = false; 52 private bool m_Enabled = false;
53 private bool m_Initialized = false; 53 private bool m_Initialized = false;
54 54
55 public Type ReplacableInterface 55 public Type ReplaceableInterface
56 { 56 {
57 get { return null; } 57 get { return null; }
58 } 58 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 3f323f1..b544138 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -50,7 +50,7 @@ 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 53 public Type ReplaceableInterface
54 { 54 {
55 get { return null; } 55 get { return null; }
56 } 56 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
index 2b7f7e8..cb87f6f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
60 60
61 #region ISharedRegionModule 61 #region ISharedRegionModule
62 62
63 public Type ReplacableInterface 63 public Type ReplaceableInterface
64 { 64 {
65 get { return null; } 65 get { return null; }
66 } 66 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
index f50cef9..a52c70b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
@@ -49,7 +49,7 @@ 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 52 public Type ReplaceableInterface
53 { 53 {
54 get { return null; } 54 get { return null; }
55 } 55 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index 0d4a09f..61bf481 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
60 60
61 #region ISharedRegionModule 61 #region ISharedRegionModule
62 62
63 public Type ReplacableInterface 63 public Type ReplaceableInterface
64 { 64 {
65 get { return null; } 65 get { return null; }
66 } 66 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
index 6c3a025..c5bc03b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
@@ -51,7 +51,7 @@ 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 54 public Type ReplaceableInterface
55 { 55 {
56 get { return null; } 56 get { return null; }
57 } 57 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
index 0924de7..fcd0304 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
@@ -46,7 +46,7 @@ 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 49 public Type ReplaceableInterface
50 { 50 {
51 get { return null; } 51 get { return null; }
52 } 52 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
index abf8c4f..a2b854b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
45 45
46 private bool m_Enabled = false; 46 private bool m_Enabled = false;
47 47
48 public Type ReplacableInterface 48 public Type ReplaceableInterface
49 { 49 {
50 get { return null; } 50 get { return null; }
51 } 51 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 8c905d6..ba271fd 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
159 { 159 {
160 } 160 }
161 161
162 public Type ReplacableInterface 162 public Type ReplaceableInterface
163 { 163 {
164 get { return null; } 164 get { return null; }
165 } 165 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 3f640c5..1f25f28 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
128 { 128 {
129 } 129 }
130 130
131 public Type ReplacableInterface 131 public Type ReplaceableInterface
132 { 132 {
133 get { return null; } 133 get { return null; }
134 } 134 }
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
index 885f1ff..ff606b1 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
51 /// that the developer expects to be replaced by third party provided 51 /// that the developer expects to be replaced by third party provided
52 /// modules. 52 /// modules.
53 /// </summary> 53 /// </summary>
54 Type ReplacableInterface { get; } 54 Type ReplaceableInterface { get; }
55 55
56 /// <summary> 56 /// <summary>
57 /// 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
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index d7e7a56..70e80bc 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
54 54
55 #region INonSharedRegionModule Members 55 #region INonSharedRegionModule Members
56 56
57 public Type ReplacableInterface 57 public Type ReplaceableInterface
58 { 58 {
59 get { return null; } 59 get { return null; }
60 } 60 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index bf6d5e7..c864993 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -214,7 +214,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
214 { 214 {
215 } 215 }
216 216
217 new public Type ReplacableInterface 217 new public Type ReplaceableInterface
218 { 218 {
219 get { return null; } 219 get { return null; }
220 } 220 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 5465678..febb491 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -388,7 +388,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
388 VivoxLogout(); 388 VivoxLogout();
389 } 389 }
390 390
391 public Type ReplacableInterface 391 public Type ReplaceableInterface
392 { 392 {
393 get { return null; } 393 get { return null; }
394 } 394 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 0bfb8e7..631d801 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
176 m_msgTransferModule = null; 176 m_msgTransferModule = null;
177 } 177 }
178 178
179 public Type ReplacableInterface 179 public Type ReplaceableInterface
180 { 180 {
181 get { return null; } 181 get { return null; }
182 } 182 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 725c303..20f34b5 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
234 m_clientRequestIDFlushTimer.Stop(); 234 m_clientRequestIDFlushTimer.Stop();
235 } 235 }
236 236
237 public Type ReplacableInterface 237 public Type ReplaceableInterface
238 { 238 {
239 get { return null; } 239 get { return null; }
240 } 240 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 115660a..b3eaa37 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
77 } 77 }
78 78
79 // this module is not intended to be replaced, but there should only be 1 of them. 79 // this module is not intended to be replaced, but there should only be 1 of them.
80 public Type ReplacableInterface 80 public Type ReplaceableInterface
81 { 81 {
82 get { return null; } 82 get { return null; }
83 } 83 }
diff --git a/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs b/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
index 1116db0..97fa63c 100644
--- a/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Freeswitch
72 { 72 {
73 } 73 }
74 74
75 public Type ReplacableInterface 75 public Type ReplaceableInterface
76 { 76 {
77 get { return null; } 77 get { return null; }
78 } 78 }
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 696f915..3160cd3 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -220,7 +220,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
220 { 220 {
221 } 221 }
222 222
223 public Type ReplacableInterface 223 public Type ReplaceableInterface
224 { 224 {
225 get { return typeof(IMoneyModule); } 225 get { return typeof(IMoneyModule); }
226 } 226 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 987827c..8ad916c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
207 { 207 {
208 } 208 }
209 209
210 public Type ReplacableInterface 210 public Type ReplaceableInterface
211 { 211 {
212 get { return null; } 212 get { return null; }
213 } 213 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index ff75e2f..3ef5ae8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -402,7 +402,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
402 return 0; 402 return 0;
403 } 403 }
404 404
405 public Type ReplacableInterface 405 public Type ReplaceableInterface
406 { 406 {
407 get { return null; } 407 get { return null; }
408 } 408 }