* Rex merge, region/environment
Adam Frisby
parent
dd96983915
commit
bd57a81e76
File diff suppressed because it is too large
Load Diff
|
|
@ -1,28 +1,56 @@
|
|||
using System;
|
||||
|
||||
namespace OpenSim.Region.Environment
|
||||
{
|
||||
/// <summary>
|
||||
/// Bit Vector for Which Modules to send an instant message to from the Scene or an Associated Module
|
||||
/// </summary>
|
||||
|
||||
// This prevents the Modules from sending Instant messages to other modules through the scene
|
||||
// and then receiving the same messages
|
||||
|
||||
// This is mostly here because on LLSL and the SecondLife Client, IMs,Groups and friends are linked
|
||||
// inseparably
|
||||
|
||||
[Flags]
|
||||
public enum InstantMessageReceiver : uint
|
||||
{
|
||||
/// <summary>None of them.. here for posterity and amusement</summary>
|
||||
None = 0,
|
||||
/// <summary>The IM Module</summary>
|
||||
IMModule = 0x00000001,
|
||||
/// <summary>The Friends Module</summary>
|
||||
FriendsModule = 0x00000002,
|
||||
/// <summary>The Groups Module</summary>
|
||||
GroupsModule = 0x00000004
|
||||
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSim Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
using System;
|
||||
|
||||
namespace OpenSim.Region.Environment
|
||||
{
|
||||
/// <summary>
|
||||
/// Bit Vector for Which Modules to send an instant message to from the Scene or an Associated Module
|
||||
/// </summary>
|
||||
|
||||
// This prevents the Modules from sending Instant messages to other modules through the scene
|
||||
// and then receiving the same messages
|
||||
|
||||
// This is mostly here because on LLSL and the SecondLife Client, IMs,Groups and friends are linked
|
||||
// inseparably
|
||||
|
||||
[Flags]
|
||||
public enum InstantMessageReceiver : uint
|
||||
{
|
||||
/// <summary>None of them.. here for posterity and amusement</summary>
|
||||
None = 0,
|
||||
/// <summary>The IM Module</summary>
|
||||
IMModule = 0x00000001,
|
||||
/// <summary>The Friends Module</summary>
|
||||
FriendsModule = 0x00000002,
|
||||
/// <summary>The Groups Module</summary>
|
||||
GroupsModule = 0x00000004
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,297 +1,316 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSim Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework.Console;
|
||||
using OpenSim.Region.Environment.Interfaces;
|
||||
using OpenSim.Region.Environment.Modules;
|
||||
using OpenSim.Region.Environment.Scenes;
|
||||
|
||||
namespace OpenSim.Region.Environment
|
||||
{
|
||||
public class ModuleLoader
|
||||
{
|
||||
public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>();
|
||||
|
||||
private readonly List<IRegionModule> m_loadedModules = new List<IRegionModule>();
|
||||
private Dictionary<string, IRegionModule> m_loadedSharedModules = new Dictionary<string, IRegionModule>();
|
||||
private readonly LogBase m_log;
|
||||
private readonly IConfigSource m_config;
|
||||
|
||||
public ModuleLoader(LogBase log, IConfigSource config)
|
||||
{
|
||||
m_log = log;
|
||||
m_config = config;
|
||||
}
|
||||
|
||||
public IRegionModule[] GetLoadedSharedModules
|
||||
{
|
||||
get
|
||||
{
|
||||
IRegionModule[] regionModules = new IRegionModule[m_loadedSharedModules.Count];
|
||||
m_loadedSharedModules.Values.CopyTo(regionModules, 0);
|
||||
return regionModules;
|
||||
}
|
||||
}
|
||||
|
||||
public void PickupModules(Scene scene, string moduleDir)
|
||||
{
|
||||
DirectoryInfo dir = new DirectoryInfo(moduleDir);
|
||||
|
||||
foreach (FileInfo fileInfo in dir.GetFiles("*.dll"))
|
||||
{
|
||||
LoadRegionModules(fileInfo.FullName, scene);
|
||||
}
|
||||
}
|
||||
|
||||
public void LoadDefaultSharedModules()
|
||||
{
|
||||
DynamicTextureModule dynamicModule = new DynamicTextureModule();
|
||||
if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
|
||||
{
|
||||
m_log.Error("MODULES", "Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(dynamicModule.Name, dynamicModule);
|
||||
}
|
||||
|
||||
ChatModule chat = new ChatModule();
|
||||
if (m_loadedSharedModules.ContainsKey(chat.Name))
|
||||
{
|
||||
m_log.Error("MODULES", "Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(chat.Name, chat);
|
||||
}
|
||||
|
||||
InstantMessageModule imMod = new InstantMessageModule();
|
||||
if (m_loadedSharedModules.ContainsKey(imMod.Name))
|
||||
{
|
||||
m_log.Error("MODULES", "Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(imMod.Name, imMod);
|
||||
}
|
||||
|
||||
LoadImageURLModule loadMod = new LoadImageURLModule();
|
||||
if (m_loadedSharedModules.ContainsKey(loadMod.Name))
|
||||
{
|
||||
m_log.Error("MODULES", "Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(loadMod.Name, loadMod);
|
||||
}
|
||||
|
||||
AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
|
||||
if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
|
||||
{
|
||||
m_log.Error("MODULES", "Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
|
||||
}
|
||||
|
||||
XMLRPCModule xmlRpcMod = new XMLRPCModule();
|
||||
if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
|
||||
{
|
||||
m_log.Error("MODULES", "Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(xmlRpcMod.Name, xmlRpcMod);
|
||||
}
|
||||
//TextureDownloadModule textureModule = new TextureDownloadModule();
|
||||
//LoadedSharedModules.Add(textureModule.Name, textureModule);
|
||||
}
|
||||
|
||||
public void InitialiseSharedModules(Scene scene)
|
||||
{
|
||||
foreach (IRegionModule module in m_loadedSharedModules.Values)
|
||||
{
|
||||
module.Initialise(scene, m_config);
|
||||
scene.AddModule(module.Name, module); //should be doing this?
|
||||
}
|
||||
}
|
||||
|
||||
public void InitializeModule(IRegionModule module, Scene scene)
|
||||
{
|
||||
module.Initialise(scene, m_config);
|
||||
scene.AddModule(module.Name, module);
|
||||
m_loadedModules.Add(module);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads/initialises a Module instance that can be used by multiple Regions
|
||||
/// </summary>
|
||||
/// <param name="dllName"></param>
|
||||
/// <param name="moduleName"></param>
|
||||
public void LoadSharedModule(string dllName, string moduleName)
|
||||
{
|
||||
IRegionModule module = LoadModule(dllName, moduleName);
|
||||
|
||||
if (module != null)
|
||||
LoadSharedModule(module);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads/initialises a Module instance that can be used by multiple Regions
|
||||
/// </summary>
|
||||
/// <param name="module"></param>
|
||||
public void LoadSharedModule(IRegionModule module)
|
||||
{
|
||||
if (!m_loadedSharedModules.ContainsKey(module.Name))
|
||||
{
|
||||
m_loadedSharedModules.Add(module.Name, module);
|
||||
}
|
||||
}
|
||||
|
||||
public void LoadRegionModules(string dllName, Scene scene)
|
||||
{
|
||||
IRegionModule[] modules = LoadModules(dllName);
|
||||
|
||||
if (modules.Length > 0)
|
||||
{
|
||||
m_log.Verbose("MODULES", "Found Module Library [{0}]", dllName);
|
||||
foreach (IRegionModule module in modules)
|
||||
{
|
||||
if (!module.IsSharedModule)
|
||||
{
|
||||
m_log.Verbose("MODULES", " [{0}]: Initializing.", module.Name);
|
||||
InitializeModule(module, scene);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_log.Verbose("MODULES", " [{0}]: Loading Shared Module.", module.Name);
|
||||
LoadSharedModule(module);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void LoadRegionModule(string dllName, string moduleName, Scene scene)
|
||||
{
|
||||
IRegionModule module = LoadModule(dllName, moduleName);
|
||||
if (module != null)
|
||||
{
|
||||
InitializeModule(module, scene);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads a external Module (if not already loaded) and creates a new instance of it.
|
||||
/// </summary>
|
||||
/// <param name="dllName"></param>
|
||||
/// <param name="moduleName"></param>
|
||||
public IRegionModule LoadModule(string dllName, string moduleName)
|
||||
{
|
||||
IRegionModule[] modules = LoadModules(dllName);
|
||||
|
||||
foreach (IRegionModule module in modules)
|
||||
{
|
||||
if ((module != null) && (module.Name == moduleName))
|
||||
{
|
||||
return module;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public IRegionModule[] LoadModules(string dllName)
|
||||
{
|
||||
List<IRegionModule> modules = new List<IRegionModule>();
|
||||
|
||||
Assembly pluginAssembly;
|
||||
if (!LoadedAssemblys.TryGetValue(dllName, out pluginAssembly))
|
||||
{
|
||||
try
|
||||
{
|
||||
pluginAssembly = Assembly.LoadFrom(dllName);
|
||||
LoadedAssemblys.Add(dllName, pluginAssembly);
|
||||
}
|
||||
catch (BadImageFormatException)
|
||||
{
|
||||
//m_log.Verbose("MODULES", "The file [{0}] is not a module assembly.", e.FileName);
|
||||
}
|
||||
}
|
||||
|
||||
if (pluginAssembly != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (Type pluginType in pluginAssembly.GetTypes())
|
||||
{
|
||||
if (pluginType.IsPublic)
|
||||
{
|
||||
if (!pluginType.IsAbstract)
|
||||
{
|
||||
if (pluginType.GetInterface("IRegionModule") != null)
|
||||
{
|
||||
modules.Add((IRegionModule)Activator.CreateInstance(pluginType));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (ReflectionTypeLoadException)
|
||||
{
|
||||
m_log.Verbose("MODULES", "Could not load types for [{0}].", pluginAssembly.FullName);
|
||||
}
|
||||
}
|
||||
|
||||
return modules.ToArray();
|
||||
}
|
||||
|
||||
public void PostInitialise()
|
||||
{
|
||||
foreach (IRegionModule module in m_loadedSharedModules.Values)
|
||||
{
|
||||
module.PostInitialise();
|
||||
}
|
||||
|
||||
foreach (IRegionModule module in m_loadedModules)
|
||||
{
|
||||
module.PostInitialise();
|
||||
}
|
||||
}
|
||||
|
||||
public void ClearCache()
|
||||
{
|
||||
LoadedAssemblys.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSim Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework.Console;
|
||||
using OpenSim.Region.Environment.Interfaces;
|
||||
using OpenSim.Region.Environment.Modules;
|
||||
using OpenSim.Region.Environment.Scenes;
|
||||
|
||||
namespace OpenSim.Region.Environment
|
||||
{
|
||||
public class ModuleLoader
|
||||
{
|
||||
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>();
|
||||
|
||||
private readonly List<IRegionModule> m_loadedModules = new List<IRegionModule>();
|
||||
private readonly Dictionary<string, IRegionModule> m_loadedSharedModules = new Dictionary<string, IRegionModule>();
|
||||
private readonly IConfigSource m_config;
|
||||
|
||||
public ModuleLoader(IConfigSource config)
|
||||
{
|
||||
m_config = config;
|
||||
}
|
||||
|
||||
public IRegionModule[] GetLoadedSharedModules
|
||||
{
|
||||
get
|
||||
{
|
||||
IRegionModule[] regionModules = new IRegionModule[m_loadedSharedModules.Count];
|
||||
m_loadedSharedModules.Values.CopyTo(regionModules, 0);
|
||||
return regionModules;
|
||||
}
|
||||
}
|
||||
|
||||
public void PickupModules(Scene scene, string moduleDir)
|
||||
{
|
||||
DirectoryInfo dir = new DirectoryInfo(moduleDir);
|
||||
|
||||
foreach (FileInfo fileInfo in dir.GetFiles("*.dll"))
|
||||
{
|
||||
LoadRegionModules(fileInfo.FullName, scene);
|
||||
}
|
||||
}
|
||||
|
||||
public void LoadDefaultSharedModules()
|
||||
{
|
||||
DynamicTextureModule dynamicModule = new DynamicTextureModule();
|
||||
if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
|
||||
{
|
||||
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(dynamicModule.Name, dynamicModule);
|
||||
}
|
||||
|
||||
ChatModule chat = new ChatModule();
|
||||
if (m_loadedSharedModules.ContainsKey(chat.Name))
|
||||
{
|
||||
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(chat.Name, chat);
|
||||
}
|
||||
|
||||
InstantMessageModule imMod = new InstantMessageModule();
|
||||
if (m_loadedSharedModules.ContainsKey(imMod.Name))
|
||||
{
|
||||
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(imMod.Name, imMod);
|
||||
}
|
||||
|
||||
LoadImageURLModule loadMod = new LoadImageURLModule();
|
||||
if (m_loadedSharedModules.ContainsKey(loadMod.Name))
|
||||
{
|
||||
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(loadMod.Name, loadMod);
|
||||
}
|
||||
|
||||
AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
|
||||
if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
|
||||
{
|
||||
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
|
||||
}
|
||||
|
||||
XMLRPCModule xmlRpcMod = new XMLRPCModule();
|
||||
if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
|
||||
{
|
||||
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(xmlRpcMod.Name, xmlRpcMod);
|
||||
}
|
||||
//TextureDownloadModule textureModule = new TextureDownloadModule();
|
||||
|
||||
//LoadedSharedModules.Add(textureModule.Name, textureModule);
|
||||
|
||||
AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule();
|
||||
if (m_loadedSharedModules.ContainsKey(transactionsModule.Name))
|
||||
{
|
||||
m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_loadedSharedModules.Add(transactionsModule.Name, transactionsModule);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void InitialiseSharedModules(Scene scene)
|
||||
{
|
||||
foreach (IRegionModule module in m_loadedSharedModules.Values)
|
||||
{
|
||||
module.Initialise(scene, m_config);
|
||||
scene.AddModule(module.Name, module); //should be doing this?
|
||||
}
|
||||
}
|
||||
|
||||
public void InitializeModule(IRegionModule module, Scene scene)
|
||||
{
|
||||
module.Initialise(scene, m_config);
|
||||
scene.AddModule(module.Name, module);
|
||||
m_loadedModules.Add(module);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads/initialises a Module instance that can be used by multiple Regions
|
||||
/// </summary>
|
||||
/// <param name="dllName"></param>
|
||||
/// <param name="moduleName"></param>
|
||||
public void LoadSharedModule(string dllName, string moduleName)
|
||||
{
|
||||
IRegionModule module = LoadModule(dllName, moduleName);
|
||||
|
||||
if (module != null)
|
||||
LoadSharedModule(module);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads/initialises a Module instance that can be used by multiple Regions
|
||||
/// </summary>
|
||||
/// <param name="module"></param>
|
||||
public void LoadSharedModule(IRegionModule module)
|
||||
{
|
||||
if (!m_loadedSharedModules.ContainsKey(module.Name))
|
||||
{
|
||||
m_loadedSharedModules.Add(module.Name, module);
|
||||
}
|
||||
}
|
||||
|
||||
public void LoadRegionModules(string dllName, Scene scene)
|
||||
{
|
||||
IRegionModule[] modules = LoadModules(dllName);
|
||||
|
||||
if (modules.Length > 0)
|
||||
{
|
||||
m_log.InfoFormat("[MODULES]: Found Module Library [{0}]", dllName);
|
||||
foreach (IRegionModule module in modules)
|
||||
{
|
||||
if (!module.IsSharedModule)
|
||||
{
|
||||
m_log.InfoFormat("[MODULES]: [{0}]: Initializing.", module.Name);
|
||||
InitializeModule(module, scene);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_log.InfoFormat("[MODULES]: [{0}]: Loading Shared Module.", module.Name);
|
||||
LoadSharedModule(module);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void LoadRegionModule(string dllName, string moduleName, Scene scene)
|
||||
{
|
||||
IRegionModule module = LoadModule(dllName, moduleName);
|
||||
if (module != null)
|
||||
{
|
||||
InitializeModule(module, scene);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads a external Module (if not already loaded) and creates a new instance of it.
|
||||
/// </summary>
|
||||
/// <param name="dllName"></param>
|
||||
/// <param name="moduleName"></param>
|
||||
public IRegionModule LoadModule(string dllName, string moduleName)
|
||||
{
|
||||
IRegionModule[] modules = LoadModules(dllName);
|
||||
|
||||
foreach (IRegionModule module in modules)
|
||||
{
|
||||
if ((module != null) && (module.Name == moduleName))
|
||||
{
|
||||
return module;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public IRegionModule[] LoadModules(string dllName)
|
||||
{
|
||||
List<IRegionModule> modules = new List<IRegionModule>();
|
||||
|
||||
Assembly pluginAssembly;
|
||||
if (!LoadedAssemblys.TryGetValue(dllName, out pluginAssembly))
|
||||
{
|
||||
try
|
||||
{
|
||||
pluginAssembly = Assembly.LoadFrom(dllName);
|
||||
LoadedAssemblys.Add(dllName, pluginAssembly);
|
||||
}
|
||||
catch (BadImageFormatException)
|
||||
{
|
||||
//m_log.InfoFormat("[MODULES]: The file [{0}] is not a module assembly.", e.FileName);
|
||||
}
|
||||
}
|
||||
|
||||
if (pluginAssembly != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (Type pluginType in pluginAssembly.GetTypes())
|
||||
{
|
||||
if (pluginType.IsPublic)
|
||||
{
|
||||
if (!pluginType.IsAbstract)
|
||||
{
|
||||
if (pluginType.GetInterface("IRegionModule") != null)
|
||||
{
|
||||
modules.Add((IRegionModule)Activator.CreateInstance(pluginType));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (ReflectionTypeLoadException)
|
||||
{
|
||||
m_log.InfoFormat("[MODULES]: Could not load types for [{0}].", pluginAssembly.FullName);
|
||||
}
|
||||
}
|
||||
|
||||
return modules.ToArray();
|
||||
}
|
||||
|
||||
public void PostInitialise()
|
||||
{
|
||||
foreach (IRegionModule module in m_loadedSharedModules.Values)
|
||||
{
|
||||
module.PostInitialise();
|
||||
}
|
||||
|
||||
foreach (IRegionModule module in m_loadedModules)
|
||||
{
|
||||
module.PostInitialise();
|
||||
}
|
||||
}
|
||||
|
||||
public void ClearCache()
|
||||
{
|
||||
LoadedAssemblys.Clear();
|
||||
}
|
||||
|
||||
public void UnloadModule(IRegionModule rm)
|
||||
{
|
||||
rm.Close();
|
||||
|
||||
m_loadedModules.Remove(rm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,77 +1,79 @@
|
|||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSim Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using OpenSim.Framework.Console;
|
||||
using OpenSim.Region.Environment.Interfaces;
|
||||
|
||||
namespace OpenSim.Region.Environment
|
||||
{
|
||||
public class StorageManager
|
||||
{
|
||||
private IRegionDataStore m_dataStore;
|
||||
|
||||
public IRegionDataStore DataStore
|
||||
{
|
||||
get { return m_dataStore; }
|
||||
}
|
||||
|
||||
public StorageManager(IRegionDataStore storage)
|
||||
{
|
||||
m_dataStore = storage;
|
||||
}
|
||||
|
||||
public StorageManager(string dllName, string connectionstring)
|
||||
{
|
||||
MainLog.Instance.Verbose("DATASTORE", "Attempting to load " + dllName);
|
||||
Assembly pluginAssembly = Assembly.LoadFrom(dllName);
|
||||
|
||||
foreach (Type pluginType in pluginAssembly.GetTypes())
|
||||
{
|
||||
if (pluginType.IsPublic)
|
||||
{
|
||||
Type typeInterface = pluginType.GetInterface("IRegionDataStore", true);
|
||||
|
||||
if (typeInterface != null)
|
||||
{
|
||||
IRegionDataStore plug =
|
||||
(IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
|
||||
plug.Initialise(connectionstring, false);
|
||||
|
||||
m_dataStore = plug;
|
||||
|
||||
MainLog.Instance.Verbose("DATASTORE", "Added IRegionDataStore Interface");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: Add checking and warning to make sure it initialised.
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSim Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using OpenSim.Framework.Console;
|
||||
using OpenSim.Region.Environment.Interfaces;
|
||||
|
||||
namespace OpenSim.Region.Environment
|
||||
{
|
||||
public class StorageManager
|
||||
{
|
||||
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private IRegionDataStore m_dataStore;
|
||||
|
||||
public IRegionDataStore DataStore
|
||||
{
|
||||
get { return m_dataStore; }
|
||||
}
|
||||
|
||||
public StorageManager(IRegionDataStore storage)
|
||||
{
|
||||
m_dataStore = storage;
|
||||
}
|
||||
|
||||
public StorageManager(string dllName, string connectionstring, bool persistPrimInventories)
|
||||
{
|
||||
m_log.Info("[DATASTORE]: Attempting to load " + dllName);
|
||||
Assembly pluginAssembly = Assembly.LoadFrom(dllName);
|
||||
|
||||
foreach (Type pluginType in pluginAssembly.GetTypes())
|
||||
{
|
||||
if (pluginType.IsPublic)
|
||||
{
|
||||
Type typeInterface = pluginType.GetInterface("IRegionDataStore", true);
|
||||
|
||||
if (typeInterface != null)
|
||||
{
|
||||
IRegionDataStore plug =
|
||||
(IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
|
||||
plug.Initialise(connectionstring, persistPrimInventories);
|
||||
|
||||
m_dataStore = plug;
|
||||
|
||||
m_log.Info("[DATASTORE]: Added IRegionDataStore Interface");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: Add checking and warning to make sure it initialised.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue