aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorSean Dague2008-04-23 20:48:23 +0000
committerSean Dague2008-04-23 20:48:23 +0000
commit3dd98a112f4308532d768943690b13c403dff68b (patch)
tree6c33ceb05d8c431720ffca11be2d025a1782fc78 /OpenSim/Framework/Communications
parentchanges to allow asset_source to be specified in the opensim.ini (diff)
downloadopensim-SC-3dd98a112f4308532d768943690b13c403dff68b.zip
opensim-SC-3dd98a112f4308532d768943690b13c403dff68b.tar.gz
opensim-SC-3dd98a112f4308532d768943690b13c403dff68b.tar.bz2
opensim-SC-3dd98a112f4308532d768943690b13c403dff68b.tar.xz
allow for Inventory database source to be specified in main
configs. This works with sqlite and nhibernate backends, and stays with default seperate ini files for mysql and mssql until someone writes those.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 769c530..5cbfcf9 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.Communications
46 /// Adds a new user server plugin - plugins will be requested in the order they were loaded. 46 /// Adds a new user server plugin - plugins will be requested in the order they were loaded.
47 /// </summary> 47 /// </summary>
48 /// <param name="FileName">The filename to the user server plugin DLL</param> 48 /// <param name="FileName">The filename to the user server plugin DLL</param>
49 public void AddPlugin(string FileName) 49 public void AddPlugin(string FileName, string connect)
50 { 50 {
51 if (!String.IsNullOrEmpty(FileName)) 51 if (!String.IsNullOrEmpty(FileName))
52 { 52 {
@@ -63,7 +63,7 @@ namespace OpenSim.Framework.Communications
63 { 63 {
64 IInventoryData plug = 64 IInventoryData plug =
65 (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 65 (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
66 plug.Initialise(); 66 plug.Initialise(connect);
67 m_plugins.Add(plug.getName(), plug); 67 m_plugins.Add(plug.getName(), plug);
68 m_log.Info("[AGENTINVENTORY]: Added IInventoryData Interface"); 68 m_log.Info("[AGENTINVENTORY]: Added IInventoryData Interface");
69 } 69 }