Thanks, sempuki, for a patch that adds .addin.xml for MSSQL and SQLite users.
parent
c9fca5315c
commit
6256078876
|
@ -284,6 +284,11 @@ namespace OpenSim.Framework
|
||||||
|
|
||||||
public bool Apply (ExtensionNode plugin)
|
public bool Apply (ExtensionNode plugin)
|
||||||
{
|
{
|
||||||
|
System.Console.WriteLine ("[WTF]: " + plugin.Path);
|
||||||
|
|
||||||
|
if (plugin.HasId == false)
|
||||||
|
return false;
|
||||||
|
|
||||||
return (plugin.Id == id);
|
return (plugin.Id == id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,17 +61,6 @@ namespace OpenSim.Grid.GridServer
|
||||||
/// <param name="provider">The name of the grid server plugin DLL</param>
|
/// <param name="provider">The name of the grid server plugin DLL</param>
|
||||||
public void AddPlugin(string provider, string connect)
|
public void AddPlugin(string provider, string connect)
|
||||||
{
|
{
|
||||||
// FIXME: convert "provider" DLL file name to Mono.Addins "id",
|
|
||||||
// which unless it is changed in the source code, is the .NET namespace.
|
|
||||||
// In the future, the "provider" should be changed to "id" in the
|
|
||||||
// config files, and is independent of filenames or namespaces.
|
|
||||||
string[] s = provider.Split ('.');
|
|
||||||
int len = s.Length;
|
|
||||||
if ((len >= 2) && (s [len-1] == "dll"))
|
|
||||||
s [len-1] = s [len-2];
|
|
||||||
|
|
||||||
provider = String.Join (".", s);
|
|
||||||
|
|
||||||
PluginLoader<IGridDataPlugin> gridloader =
|
PluginLoader<IGridDataPlugin> gridloader =
|
||||||
new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect));
|
new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect));
|
||||||
|
|
||||||
|
@ -83,8 +72,8 @@ namespace OpenSim.Grid.GridServer
|
||||||
|
|
||||||
// loader will try to load all providers (MySQL, MSSQL, etc)
|
// loader will try to load all providers (MySQL, MSSQL, etc)
|
||||||
// unless it is constrainted to the correct "id"
|
// unless it is constrainted to the correct "id"
|
||||||
//gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider + "GridData"));
|
gridloader.AddFilter ("/OpenSim/GridData", new PluginIdFilter (provider));
|
||||||
//logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider + "LogData"));
|
logloader.AddFilter ("/OpenSim/LogData", new PluginIdFilter (provider));
|
||||||
|
|
||||||
gridloader.Load();
|
gridloader.Load();
|
||||||
logloader.Load();
|
logloader.Load();
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<Addin>
|
<Addin id="OpenSim.ApplicationPlugins.LoadRegions" version="0.1">
|
||||||
<Runtime>
|
<Runtime>
|
||||||
<Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/>
|
<Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/>
|
||||||
</Runtime>
|
</Runtime>
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
<Addin id="OpenSim.Data.MSSQL" version="0.1">
|
||||||
|
<Runtime>
|
||||||
|
<Import assembly="OpenSim.Data.MSSQL.dll"/>
|
||||||
|
</Runtime>
|
||||||
|
<Dependencies>
|
||||||
|
<Addin id="OpenSim.Data" version="0.5" />
|
||||||
|
</Dependencies>
|
||||||
|
<Extension path = "/OpenSim/GridData">
|
||||||
|
<Type id="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" />
|
||||||
|
</Extension>
|
||||||
|
<Extension path = "/OpenSim/LogData">
|
||||||
|
<Type id="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLLogData" />
|
||||||
|
</Extension>
|
||||||
|
</Addin>
|
|
@ -1,4 +1,4 @@
|
||||||
<Addin>
|
<Addin id="OpenSim.Data.MySQL" version="0.1">
|
||||||
<Runtime>
|
<Runtime>
|
||||||
<Import assembly="OpenSim.Data.MySQL.dll"/>
|
<Import assembly="OpenSim.Data.MySQL.dll"/>
|
||||||
</Runtime>
|
</Runtime>
|
||||||
|
@ -6,9 +6,9 @@
|
||||||
<Addin id="OpenSim.Data" version="0.5" />
|
<Addin id="OpenSim.Data" version="0.5" />
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
<Extension path = "/OpenSim/GridData">
|
<Extension path = "/OpenSim/GridData">
|
||||||
<Type type="OpenSim.Data.MySQL.MySQLGridData" />
|
<Type id="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLGridData" />
|
||||||
</Extension>
|
</Extension>
|
||||||
<Extension path = "/OpenSim/LogData">
|
<Extension path = "/OpenSim/LogData">
|
||||||
<Type type="OpenSim.Data.MySQL.MySQLLogData" />
|
<Type id="OpenSim.Data.MySQL.dll" type="OpenSim.Data.MySQL.MySQLLogData" />
|
||||||
</Extension>
|
</Extension>
|
||||||
</Addin>
|
</Addin>
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
<Addin id="OpenSim.Data.SQLite" version="0.1">
|
||||||
|
<Runtime>
|
||||||
|
<Import assembly="OpenSim.Data.SQLite.dll"/>
|
||||||
|
</Runtime>
|
||||||
|
<Dependencies>
|
||||||
|
<Addin id="OpenSim.Data" version="0.5" />
|
||||||
|
</Dependencies>
|
||||||
|
<Extension path = "/OpenSim/GridData">
|
||||||
|
<Type id="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" />
|
||||||
|
</Extension>
|
||||||
|
</Addin>
|
|
@ -1,4 +1,4 @@
|
||||||
<Addin>
|
<Addin id="OpenSim.ApplicationPlugins.RemoteController" version="0.1">
|
||||||
<Runtime>
|
<Runtime>
|
||||||
<Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/>
|
<Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/>
|
||||||
</Runtime>
|
</Runtime>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<Addin>
|
<Addin id="OpenSim.ApplicationPlugins.Rest.Inventory" version="0.1">
|
||||||
<Runtime>
|
<Runtime>
|
||||||
<Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/>
|
<Import assembly="OpenSim.ApplicationPlugins.Rest.Inventory.dll"/>
|
||||||
</Runtime>
|
</Runtime>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<Addin>
|
<Addin id="OpenSim.ApplicationPlugins.Rest.Regions" version="0.1">
|
||||||
<Runtime>
|
<Runtime>
|
||||||
<Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/>
|
<Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/>
|
||||||
</Runtime>
|
</Runtime>
|
||||||
|
|
Loading…
Reference in New Issue