diff options
| author | Melanie | 2010-09-14 23:05:42 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-14 23:06:44 +0100 |
| commit | 3275fbec540a09228fe0be05113870fc42639341 (patch) | |
| tree | 0c9052a84887d0d38a5f39e8a96d335c18a13880 | |
| parent | Allow to place the connection strings and providers for estate and region (diff) | |
| download | opensim-SC_OLD-3275fbec540a09228fe0be05113870fc42639341.zip opensim-SC_OLD-3275fbec540a09228fe0be05113870fc42639341.tar.gz opensim-SC_OLD-3275fbec540a09228fe0be05113870fc42639341.tar.bz2 opensim-SC_OLD-3275fbec540a09228fe0be05113870fc42639341.tar.xz | |
Fix the above
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/EstateDataService.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs index 2eedebb..8a8b46d 100644 --- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs | |||
| @@ -60,9 +60,8 @@ namespace OpenSim.Services.Connectors | |||
| 60 | if (dbConfig != null) | 60 | if (dbConfig != null) |
| 61 | { | 61 | { |
| 62 | dllName = dbConfig.GetString("StorageProvider", String.Empty); | 62 | dllName = dbConfig.GetString("StorageProvider", String.Empty); |
| 63 | connString = dbConfig.GetString("EstateConnectionString", String.Empty); | 63 | connString = dbConfig.GetString("ConnectionString", String.Empty); |
| 64 | if (String.IsNullOrEmpty(connString)) | 64 | connString = dbConfig.GetString("EstateConnectionString", connString); |
| 65 | connString = dbConfig.GetString("ConnectionString", String.Empty); | ||
| 66 | } | 65 | } |
| 67 | 66 | ||
| 68 | // Try reading the [EstateDataStore] section, if it exists | 67 | // Try reading the [EstateDataStore] section, if it exists |
| @@ -70,7 +69,7 @@ namespace OpenSim.Services.Connectors | |||
| 70 | if (estConfig != null) | 69 | if (estConfig != null) |
| 71 | { | 70 | { |
| 72 | dllName = estConfig.GetString("StorageProvider", dllName); | 71 | dllName = estConfig.GetString("StorageProvider", dllName); |
| 73 | connString = dbConfig.GetString("ConnectionString", connString); | 72 | connString = estConfig.GetString("ConnectionString", connString); |
| 74 | } | 73 | } |
| 75 | 74 | ||
| 76 | // We tried, but this doesn't exist. We can't proceed | 75 | // We tried, but this doesn't exist. We can't proceed |