diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/StorageManager.cs | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs index e375343..90cdf0a 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs +++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Interfaces | |||
40 | /// </summary> | 40 | /// </summary> |
41 | /// <param name="filename">The file to save the database to (may not be applicable)</param> | 41 | /// <param name="filename">The file to save the database to (may not be applicable)</param> |
42 | /// <param name="dbname">The name of the database to store to (may not be applicable)</param> | 42 | /// <param name="dbname">The name of the database to store to (may not be applicable)</param> |
43 | void Initialise(string filename, string dbname); | 43 | void Initialise(string filename); |
44 | 44 | ||
45 | void StoreObject(SceneObjectGroup obj, LLUUID regionUUID); | 45 | void StoreObject(SceneObjectGroup obj, LLUUID regionUUID); |
46 | void RemoveObject(LLUUID uuid, LLUUID regionUUID); | 46 | void RemoveObject(LLUUID uuid, LLUUID regionUUID); |
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs index 11f0ce0..b7bd8cc 100644 --- a/OpenSim/Region/Environment/StorageManager.cs +++ b/OpenSim/Region/Environment/StorageManager.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment | |||
47 | m_dataStore = storage; | 47 | m_dataStore = storage; |
48 | } | 48 | } |
49 | 49 | ||
50 | public StorageManager(string dllName, string dataStoreFile, string dataStoreDB) | 50 | public StorageManager(string dllName, string connectionstring) |
51 | { | 51 | { |
52 | MainLog.Instance.Verbose("DATASTORE", "Attempting to load " + dllName); | 52 | MainLog.Instance.Verbose("DATASTORE", "Attempting to load " + dllName); |
53 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | 53 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); |
@@ -62,19 +62,15 @@ namespace OpenSim.Region.Environment | |||
62 | { | 62 | { |
63 | IRegionDataStore plug = | 63 | IRegionDataStore plug = |
64 | (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 64 | (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
65 | plug.Initialise(dataStoreFile, dataStoreDB); | 65 | plug.Initialise(connectionstring); |
66 | 66 | ||
67 | m_dataStore = plug; | 67 | m_dataStore = plug; |
68 | 68 | ||
69 | MainLog.Instance.Verbose("DATASTORE", "Added IRegionDataStore Interface"); | 69 | MainLog.Instance.Verbose("DATASTORE", "Added IRegionDataStore Interface"); |
70 | } | 70 | } |
71 | |||
72 | typeInterface = null; | ||
73 | } | 71 | } |
74 | } | 72 | } |
75 | 73 | ||
76 | pluginAssembly = null; | ||
77 | |||
78 | //TODO: Add checking and warning to make sure it initialised. | 74 | //TODO: Add checking and warning to make sure it initialised. |
79 | } | 75 | } |
80 | } | 76 | } |