OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-09-14 22:50:38 +01:00
parent 540a1912ce 585e575d23
commit 18beb796bc
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,14 @@ namespace OpenSim.Services.Connectors
connString = dbConfig.GetString("ConnectionString", String.Empty); connString = dbConfig.GetString("ConnectionString", String.Empty);
} }
// Try reading the [EstateDataStore] section, if it exists
IConfig estConfig = config.Configs["EstateDataStore"];
if (estConfig != null)
{
dllName = estConfig.GetString("StorageProvider", dllName);
connString = dbConfig.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
if (dllName == String.Empty) if (dllName == String.Empty)
throw new Exception("No StorageProvider configured"); throw new Exception("No StorageProvider configured");

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

@ -63,6 +63,14 @@ namespace OpenSim.Services.Connectors
connString = dbConfig.GetString("ConnectionString", String.Empty); 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 // We tried, but this doesn't exist. We can't proceed
if (dllName == String.Empty) if (dllName == String.Empty)
throw new Exception("No StorageProvider configured"); throw new Exception("No StorageProvider configured");