diff options
author | Sean Dague | 2008-04-23 20:48:23 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-23 20:48:23 +0000 |
commit | 3dd98a112f4308532d768943690b13c403dff68b (patch) | |
tree | 6c33ceb05d8c431720ffca11be2d025a1782fc78 /OpenSim/Grid | |
parent | changes to allow asset_source to be specified in the opensim.ini (diff) | |
download | opensim-SC_OLD-3dd98a112f4308532d768943690b13c403dff68b.zip opensim-SC_OLD-3dd98a112f4308532d768943690b13c403dff68b.tar.gz opensim-SC_OLD-3dd98a112f4308532d768943690b13c403dff68b.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Grid/InventoryServer/InventoryManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/InventoryServer/Main.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs index b3c6891..1d4a4e3 100644 --- a/OpenSim/Grid/InventoryServer/InventoryManager.cs +++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.InventoryServer | |||
48 | /// Adds a new inventory server plugin - user servers will be requested in the order they were loaded. | 48 | /// Adds a new inventory server plugin - user servers will be requested in the order they were loaded. |
49 | /// </summary> | 49 | /// </summary> |
50 | /// <param name="FileName">The filename to the inventory server plugin DLL</param> | 50 | /// <param name="FileName">The filename to the inventory server plugin DLL</param> |
51 | public void AddDatabasePlugin(string FileName) | 51 | public void AddDatabasePlugin(string FileName, string dbconnect) |
52 | { | 52 | { |
53 | m_log.Info("[" + OpenInventory_Main.LogName + "]: Invenstorage: Attempting to load " + FileName); | 53 | m_log.Info("[" + OpenInventory_Main.LogName + "]: Invenstorage: Attempting to load " + FileName); |
54 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | 54 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); |
@@ -65,7 +65,7 @@ namespace OpenSim.Grid.InventoryServer | |||
65 | { | 65 | { |
66 | IInventoryData plug = | 66 | IInventoryData plug = |
67 | (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 67 | (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
68 | plug.Initialise(); | 68 | plug.Initialise(dbconnect); |
69 | _databasePlugin = plug; | 69 | _databasePlugin = plug; |
70 | m_log.Info("[" + OpenInventory_Main.LogName + "]: " + | 70 | m_log.Info("[" + OpenInventory_Main.LogName + "]: " + |
71 | "Invenstorage: Added IInventoryData Interface"); | 71 | "Invenstorage: Added IInventoryData Interface"); |
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 2454650..85d9ba5 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Grid.InventoryServer | |||
72 | 72 | ||
73 | m_inventoryService = new GridInventoryService(); | 73 | m_inventoryService = new GridInventoryService(); |
74 | // m_inventoryManager = new InventoryManager(); | 74 | // m_inventoryManager = new InventoryManager(); |
75 | m_inventoryService.AddPlugin(m_config.DatabaseProvider); | 75 | m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); |
76 | 76 | ||
77 | m_log.Info("[" + LogName + "]: Starting HTTP server ..."); | 77 | m_log.Info("[" + LogName + "]: Starting HTTP server ..."); |
78 | 78 | ||