Fix the above
parent
585e575d23
commit
3275fbec54
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue