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

Reverted the order of reading configs in GridServiceBase.

remotes/origin/0.6.7-post-fixes
Diva Canto 2009-09-18 20:09:43 -07:00
parent 66f8166bd0
commit 15d6bb4ce5
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Services/GridService/GridServiceBase.cs
View File

@ -46,17 +46,6 @@ namespace OpenSim.Services.GridService
string connString = String.Empty; string connString = String.Empty;
string realm = "regions"; string realm = "regions";
//
// Try reading the [AssetService] section first, if it exists
//
IConfig gridConfig = config.Configs["GridService"];
if (gridConfig != null)
{
dllName = gridConfig.GetString("StorageProvider", dllName);
connString = gridConfig.GetString("ConnectionString", connString);
realm = gridConfig.GetString("Realm", realm);
}
// //
// Try reading the [DatabaseService] section, if it exists // Try reading the [DatabaseService] section, if it exists
// //
@ -69,6 +58,17 @@ namespace OpenSim.Services.GridService
connString = dbConfig.GetString("ConnectionString", String.Empty); connString = dbConfig.GetString("ConnectionString", String.Empty);
} }
//
// [GridService] section overrides [DatabaseService], if it exists
//
IConfig gridConfig = config.Configs["GridService"];
if (gridConfig != null)
{
dllName = gridConfig.GetString("StorageProvider", dllName);
connString = gridConfig.GetString("ConnectionString", connString);
realm = gridConfig.GetString("Realm", realm);
}
// //
// We tried, but this doesn't exist. We can't proceed. // We tried, but this doesn't exist. We can't proceed.
// //