aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs3
-rw-r--r--OpenSim/Region/Environment/StorageManager.cs6
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
index 0316f20..ad5983c 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
@@ -39,8 +39,7 @@ namespace OpenSim.Region.Environment.Interfaces
39 /// </summary> 39 /// </summary>
40 /// <param name="filename">The file to save the database to (may not be applicable). Alternatively, 40 /// <param name="filename">The file to save the database to (may not be applicable). Alternatively,
41 /// a connection string for the database</param> 41 /// a connection string for the database</param>
42 /// <param name="persistPrimInventories">Temporary switch while this option is immature</param> 42 void Initialise(string filename);
43 void Initialise(string filename, bool persistPrimInventories);
44 43
45 /// <summary> 44 /// <summary>
46 /// Stores all object's details apart from inventory 45 /// Stores all object's details apart from inventory
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs
index 768e12c..36c9196 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Environment/StorageManager.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Environment
55 m_dataStore = storage; 55 m_dataStore = storage;
56 } 56 }
57 57
58 public StorageManager(string dllName, string connectionstring, bool persistPrimInventories) 58 public StorageManager(string dllName, string connectionstring, string estateconnectionstring)
59 { 59 {
60 m_log.Info("[DATASTORE]: Attempting to load " + dllName); 60 m_log.Info("[DATASTORE]: Attempting to load " + dllName);
61 Assembly pluginAssembly = Assembly.LoadFrom(dllName); 61 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment
70 { 70 {
71 IRegionDataStore plug = 71 IRegionDataStore plug =
72 (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 72 (IRegionDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
73 plug.Initialise(connectionstring, persistPrimInventories); 73 plug.Initialise(connectionstring);
74 74
75 m_dataStore = plug; 75 m_dataStore = plug;
76 76
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment
83 { 83 {
84 IEstateDataStore estPlug = 84 IEstateDataStore estPlug =
85 (IEstateDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 85 (IEstateDataStore) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
86 estPlug.Initialise(connectionstring); 86 estPlug.Initialise(estateconnectionstring);
87 87
88 m_estateDataStore = estPlug; 88 m_estateDataStore = estPlug;
89 } 89 }