ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

plumb in connection string to the user database paths. mysql and mssql

Browse Source 
just ignore this for now, but it lets us get connect strings to sqlite
and nhibernate.
This commit is contained in:
Sean Dague
2008-05-02 18:59:12 +00:00
parent 72a7c2e2bb
commit 1b7f1c956c
10 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
/// Adds a new user server plugin - user servers will be requested in the order they were loaded.
/// </summary>
/// <param name="FileName">The filename to the user server plugin DLL</param>
public void AddPlugin(string FileName)
public void AddPlugin(string FileName, string connect)
{
if (!String.IsNullOrEmpty(FileName))
{
@@ -71,16 +71,16 @@ namespace OpenSim.Framework.Communications
{
IUserData plug =
(IUserData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
AddPlugin(plug);
AddPlugin(plug, connect);
}
}
}
}
}
public void AddPlugin(IUserData plug)
public void AddPlugin(IUserData plug, string connect)
{
plug.Initialise();
plug.Initialise(connect);
_plugins.Add(plug.Name, plug);
m_log.Info("[USERSTORAGE]: Added IUserData Interface");
}

2
OpenSim/Framework/IUserData.cs
View File

@@ -173,7 +173,7 @@ namespace OpenSim.Framework
/// <summary>
/// Initialises the plugin (artificial constructor)
/// </summary>
void Initialise();
void Initialise(string connect);
/// <summary>
/// Gets the user appearance

6
OpenSim/Framework/UserConfig.cs
View File

@@ -38,6 +38,7 @@ namespace OpenSim.Framework
public static bool DefaultHttpSSL = false;
private ConfigurationMember configMember;
public string DatabaseProvider = String.Empty;
public string DatabaseConnect = String.Empty;
public string DefaultStartupMsg = String.Empty;
public uint DefaultX = 1000;
public uint DefaultY = 1000;
@@ -77,6 +78,8 @@ namespace OpenSim.Framework
false);
configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for database provider", "OpenSim.Data.MySQL.dll", false);
configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Connection String for Database", "", false);
configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultHttpPort.ToString(), false);
@@ -110,6 +113,9 @@ namespace OpenSim.Framework
case "database_provider":
DatabaseProvider = (string) configuration_result;
break;
case "database_connect":
DatabaseConnect = (string) configuration_result;
break;
case "http_port":
HttpPort = (uint) configuration_result;
break;