diff options
| author | Justin Clark-Casey (justincc) | 2010-09-15 23:03:02 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-15 23:03:02 +0100 |
| commit | e6bc77d832812ed1e51ee643638c680f520b25d0 (patch) | |
| tree | fb295d46ba4c11a8e15e077974c03906569c5295 /OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | |
| parent | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co... (diff) | |
| parent | Mark up OpenSim.ini.example for use with an automatic configuration tool. (diff) | |
| download | opensim-SC-e6bc77d832812ed1e51ee643638c680f520b25d0.zip opensim-SC-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.gz opensim-SC-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.bz2 opensim-SC-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationDataService.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | 8 |
1 files changed, 8 insertions, 0 deletions
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"); |