Fix the above

avinationmerge
Melanie 2010-09-14 23:05:42 +01:00
parent 18beb796bc
commit 7f7bbbb84a
1 changed files with 3 additions and 4 deletions

View File

@ -60,9 +60,8 @@ namespace OpenSim.Services.Connectors
if (dbConfig != null) if (dbConfig != null)
{ {
dllName = dbConfig.GetString("StorageProvider", String.Empty); dllName = dbConfig.GetString("StorageProvider", String.Empty);
connString = dbConfig.GetString("EstateConnectionString", String.Empty); connString = dbConfig.GetString("ConnectionString", String.Empty);
if (String.IsNullOrEmpty(connString)) connString = dbConfig.GetString("EstateConnectionString", connString);
connString = dbConfig.GetString("ConnectionString", String.Empty);
} }
// Try reading the [EstateDataStore] section, if it exists // Try reading the [EstateDataStore] section, if it exists
@ -70,7 +69,7 @@ namespace OpenSim.Services.Connectors
if (estConfig != null) if (estConfig != null)
{ {
dllName = estConfig.GetString("StorageProvider", dllName); dllName = estConfig.GetString("StorageProvider", dllName);
connString = dbConfig.GetString("ConnectionString", connString); connString = estConfig.GetString("ConnectionString", connString);
} }
// We tried, but this doesn't exist. We can't proceed // We tried, but this doesn't exist. We can't proceed