ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added MySQLDataStore (adapted from MonoSqlite

Browse Source 
* Made startup a little bit more forgiving on dll load
* Minor renamings and musings
This commit is contained in:
lbsa71
2007-11-15 15:32:28 +00:00
parent 179695909a
commit 57ff76850d
6 changed files with 1065 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@@ -14,7 +14,7 @@ using Nini.Config;
[assembly:Addin]
[assembly:AddinDependency ("OpenSim", "0.4")]
namespace OpenSim.ApplicationPlugins.Example
namespace OpenSim.ApplicationPlugins.LoadRegions
{
[Extension("/OpenSim/Startup")]
public class LoadRegionsPlugin : IApplicationPlugin
@@ -55,4 +55,4 @@ namespace OpenSim.ApplicationPlugins.Example
}
}
}
}

1035
OpenSim/Framework/Data.MySQL/MySQLDataStore.cs Normal file
View File

File diff suppressed because it is too large Load Diff

6
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -64,7 +64,7 @@ namespace OpenSim
protected LocalLoginService m_loginService;
protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll";
protected string m_storageDll = "OpenSim.DataStore.NullStorage.dll";
protected string m_startupCommandsFile = "";
protected string m_shutdownCommandsFile = "";
@@ -218,7 +218,7 @@ namespace OpenSim
m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
m_storageDLL = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "");
m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "");
@@ -359,7 +359,7 @@ namespace OpenSim
protected override StorageManager CreateStorageManager(RegionInfo regionInfo)
{
return new StorageManager(m_storageDLL, regionInfo.DataStore, regionInfo.RegionName);
return new StorageManager(m_storageDll, regionInfo.DataStore, regionInfo.RegionName);
}
protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,

17
OpenSim/Region/Environment/ModuleLoader.cs
View File

@@ -194,19 +194,26 @@ namespace OpenSim.Region.Environment
if (pluginAssembly != null)
{
foreach (Type pluginType in pluginAssembly.GetTypes())
try
{
if (pluginType.IsPublic)
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (!pluginType.IsAbstract)
if (pluginType.IsPublic)
{
if (pluginType.GetInterface("IRegionModule") != null)
if (!pluginType.IsAbstract)
{
modules.Add((IRegionModule) Activator.CreateInstance(pluginType));
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();