aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2010-09-14 22:47:45 +0100
committerMelanie2010-09-14 22:47:45 +0100
commit585e575d23ebfd8c4657dbe63cd5b5d3b2b890fd (patch)
tree4be6e30fe758b519baf74e86a9ec58cdd91c0549 /OpenSim/Services
parentRemove long unused Region/Framework/ThreadTracker (diff)
downloadopensim-SC_OLD-585e575d23ebfd8c4657dbe63cd5b5d3b2b890fd.zip
opensim-SC_OLD-585e575d23ebfd8c4657dbe63cd5b5d3b2b890fd.tar.gz
opensim-SC_OLD-585e575d23ebfd8c4657dbe63cd5b5d3b2b890fd.tar.bz2
opensim-SC_OLD-585e575d23ebfd8c4657dbe63cd5b5d3b2b890fd.tar.xz
Allow to place the connection strings and providers for estate and region
in their oqn sections, for those of us who don't want a catch-all DatabaseService section.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Simulation/EstateDataService.cs8
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationDataService.cs8
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
index 87c49d3..2eedebb 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -65,6 +65,14 @@ namespace OpenSim.Services.Connectors
65 connString = dbConfig.GetString("ConnectionString", String.Empty); 65 connString = dbConfig.GetString("ConnectionString", String.Empty);
66 } 66 }
67 67
68 // Try reading the [EstateDataStore] section, if it exists
69 IConfig estConfig = config.Configs["EstateDataStore"];
70 if (estConfig != null)
71 {
72 dllName = estConfig.GetString("StorageProvider", dllName);
73 connString = dbConfig.GetString("ConnectionString", connString);
74 }
75
68 // We tried, but this doesn't exist. We can't proceed 76 // We tried, but this doesn't exist. We can't proceed
69 if (dllName == String.Empty) 77 if (dllName == String.Empty)
70 throw new Exception("No StorageProvider configured"); 78 throw new Exception("No StorageProvider configured");
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index 946f7e4..c8ecb18 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -63,6 +63,14 @@ namespace OpenSim.Services.Connectors
63 connString = dbConfig.GetString("ConnectionString", String.Empty); 63 connString = dbConfig.GetString("ConnectionString", String.Empty);
64 } 64 }
65 65
66 // Try reading the [SimulationDataStore] section
67 IConfig simConfig = config.Configs["SimulationDataStore"];
68 if (simConfig != null)
69 {
70 dllName = simConfig.GetString("StorageProvider", dllName);
71 connString = simConfig.GetString("ConnectionString", connString);
72 }
73
66 // We tried, but this doesn't exist. We can't proceed 74 // We tried, but this doesn't exist. We can't proceed
67 if (dllName == String.Empty) 75 if (dllName == String.Empty)
68 throw new Exception("No StorageProvider configured"); 76 throw new Exception("No StorageProvider configured");