OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

arthursv
Diva Canto 2009-08-10 16:02:33 -07:00
parent 0c47f8e7ab eba23048ca
commit 9f95ec4998
43 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
View File

@ -160,7 +160,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>(); List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>();
foreach (ISharedRegionModule module in m_sharedInstances) foreach (ISharedRegionModule module in m_sharedInstances)
{ {
Type replaceableInterface = module.ReplacableInterface; Type replaceableInterface = module.ReplaceableInterface;
if (replaceableInterface != null) if (replaceableInterface != null)
{ {
MethodInfo mii = mi.MakeGenericMethod(replaceableInterface); MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
@ -190,7 +190,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
{ {
INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type); INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type);
Type replaceableInterface = module.ReplacableInterface; Type replaceableInterface = module.ReplaceableInterface;
if (replaceableInterface != null) if (replaceableInterface != null)
{ {
MethodInfo mii = mi.MakeGenericMethod(replaceableInterface); MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
@ -226,7 +226,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
foreach (ISharedRegionModule module in deferredSharedModules.Values) foreach (ISharedRegionModule module in deferredSharedModules.Values)
{ {
Type replaceableInterface = module.ReplacableInterface; Type replaceableInterface = module.ReplaceableInterface;
MethodInfo mii = mi.MakeGenericMethod(replaceableInterface); MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
if (mii.Invoke(scene, new object[0]) != null) if (mii.Invoke(scene, new object[0]) != null)
@ -247,7 +247,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
List<INonSharedRegionModule> deferredlist = new List<INonSharedRegionModule>(); List<INonSharedRegionModule> deferredlist = new List<INonSharedRegionModule>();
foreach (INonSharedRegionModule module in deferredNonSharedModules.Values) foreach (INonSharedRegionModule module in deferredNonSharedModules.Values)
{ {
Type replaceableInterface = module.ReplacableInterface; Type replaceableInterface = module.ReplaceableInterface;
if (replaceableInterface != null) if (replaceableInterface != null)
{ {
MethodInfo mii = mi.MakeGenericMethod(replaceableInterface); MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);

2
OpenSim/Client/Linden/LLClientStackModule.cs
View File

@ -110,7 +110,7 @@ namespace OpenSim.Client.Linden
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Client/Linden/LLProxyLoginModule.cs
View File

@ -125,7 +125,7 @@ namespace OpenSim.Client.Linden
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Client/Linden/LLStandaloneLoginModule.cs
View File

@ -155,7 +155,7 @@ namespace OpenSim.Client.Linden
} }
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
View File

@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
get { return "Capabilities Module"; } get { return "Capabilities Module"; }
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
View File

@ -290,7 +290,7 @@ namespace OpenSim.Region.CoreModules.Asset
get { return "CenomeMemoryAssetCache"; } get { return "CenomeMemoryAssetCache"; }
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Asset
get { return "CoreAssetCache"; } get { return "CoreAssetCache"; }
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@ -159,7 +159,7 @@ namespace Flotsam.RegionModules.AssetCache
m_InvalidChars.AddRange(Path.GetInvalidFileNameChars()); m_InvalidChars.AddRange(Path.GetInvalidFileNameChars());
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Asset
// Instrumentation // Instrumentation
private uint m_DebugRate = 0; private uint m_DebugRate = 0;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
View File

@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
private IHttpServer m_HttpServer = null; private IHttpServer m_HttpServer = null;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
View File

@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
View File

@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
View File

@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
View File

@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
View File

@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
View File

@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false; private bool m_Enabled = false;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false; private bool m_Enabled = false;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
private bool m_Enabled = false; private bool m_Enabled = false;
private IImprovedAssetCache m_Cache; private IImprovedAssetCache m_Cache;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
View File

@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
View File

@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
} }
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private ISessionAuthInventoryService m_HGService; private ISessionAuthInventoryService m_HGService;
private string m_LocalGridInventoryURI = string.Empty; private string m_LocalGridInventoryURI = string.Empty;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
View File

@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private bool m_Enabled = false; private bool m_Enabled = false;
private bool m_Initialized = false; private bool m_Initialized = false;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private Scene m_Scene; private Scene m_Scene;
private InventoryServicesConnector m_RemoteConnector; private InventoryServicesConnector m_RemoteConnector;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
#region ISharedRegionModule #region ISharedRegionModule
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
private bool m_Enabled = false; private bool m_Enabled = false;
private LocalLandServicesConnector m_LocalService; private LocalLandServicesConnector m_LocalService;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
#region ISharedRegionModule #region ISharedRegionModule
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
//private string serviceDll; //private string serviceDll;
//private List<Scene> m_Scenes = new List<Scene>(); //private List<Scene> m_Scenes = new List<Scene>();
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
private bool m_Enabled = false; private bool m_Enabled = false;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
private bool m_Enabled = false; private bool m_Enabled = false;
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -128,7 +128,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/Framework/Interfaces/IRegionModuleBase.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// that the developer expects to be replaced by third party provided /// that the developer expects to be replaced by third party provided
/// modules. /// modules.
/// </summary> /// </summary>
Type ReplacableInterface { get; } Type ReplaceableInterface { get; }
/// <summary> /// <summary>
/// This is called to initialize the region module. For shared modules, this is called /// This is called to initialize the region module. For shared modules, this is called

2
OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
#region INonSharedRegionModule Members #region INonSharedRegionModule Members
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
View File

@ -214,7 +214,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
{ {
} }
new public Type ReplacableInterface new public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@ -388,7 +388,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
VivoxLogout(); VivoxLogout();
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
View File

@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_msgTransferModule = null; m_msgTransferModule = null;
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -234,7 +234,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_clientRequestIDFlushTimer.Stop(); m_clientRequestIDFlushTimer.Stop();
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
View File

@ -77,7 +77,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
} }
// this module is not intended to be replaced, but there should only be 1 of them. // this module is not intended to be replaced, but there should only be 1 of them.
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs
View File

@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Freeswitch
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
View File

@ -220,7 +220,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return typeof(IMoneyModule); } get { return typeof(IMoneyModule); }
} }

2
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
View File

@ -207,7 +207,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
{ {
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }

2
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -402,7 +402,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return 0; return 0;
} }
public Type ReplacableInterface public Type ReplaceableInterface
{ {
get { return null; } get { return null; }
} }