diff options
| author | Melanie | 2010-09-14 22:50:38 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-14 22:50:38 +0100 |
| commit | 18beb796bc9630472709949255e8c25f521ecbaf (patch) | |
| tree | e0ee058b2dad1757f15d61af537227a917b36c7c /OpenSim | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Allow to place the connection strings and providers for estate and region (diff) | |
| download | opensim-SC-18beb796bc9630472709949255e8c25f521ecbaf.zip opensim-SC-18beb796bc9630472709949255e8c25f521ecbaf.tar.gz opensim-SC-18beb796bc9630472709949255e8c25f521ecbaf.tar.bz2 opensim-SC-18beb796bc9630472709949255e8c25f521ecbaf.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/EstateDataService.cs | 8 | ||||
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | 8 |
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"); |