ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2010-09-15 23:03:02 +01:00
parent 39d27fc879 c1ccfa6d8d
commit e6bc77d832
8 changed files with 712 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Services/Connectors/Simulation/EstateDataService.cs
View File

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

8
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
View File

@@ -63,6 +63,14 @@ namespace OpenSim.Services.Connectors
connString = dbConfig.GetString("ConnectionString", String.Empty);
}
// Try reading the [SimulationDataStore] section
IConfig simConfig = config.Configs["SimulationDataStore"];
if (simConfig != null)
{
dllName = simConfig.GetString("StorageProvider", dllName);
connString = simConfig.GetString("ConnectionString", connString);
}
// We tried, but this doesn't exist. We can't proceed
if (dllName == String.Empty)
throw new Exception("No StorageProvider configured");