diff options
-rw-r--r-- | OpenSim/Services/GridService/GridServiceBase.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs index 7b69290..7522e64 100644 --- a/OpenSim/Services/GridService/GridServiceBase.cs +++ b/OpenSim/Services/GridService/GridServiceBase.cs | |||
@@ -47,17 +47,6 @@ namespace OpenSim.Services.GridService | |||
47 | string realm = "regions"; | 47 | string realm = "regions"; |
48 | 48 | ||
49 | // | 49 | // |
50 | // Try reading the [AssetService] section first, if it exists | ||
51 | // | ||
52 | IConfig gridConfig = config.Configs["GridService"]; | ||
53 | if (gridConfig != null) | ||
54 | { | ||
55 | dllName = gridConfig.GetString("StorageProvider", dllName); | ||
56 | connString = gridConfig.GetString("ConnectionString", connString); | ||
57 | realm = gridConfig.GetString("Realm", realm); | ||
58 | } | ||
59 | |||
60 | // | ||
61 | // Try reading the [DatabaseService] section, if it exists | 50 | // Try reading the [DatabaseService] section, if it exists |
62 | // | 51 | // |
63 | IConfig dbConfig = config.Configs["DatabaseService"]; | 52 | IConfig dbConfig = config.Configs["DatabaseService"]; |
@@ -70,6 +59,17 @@ namespace OpenSim.Services.GridService | |||
70 | } | 59 | } |
71 | 60 | ||
72 | // | 61 | // |
62 | // [GridService] section overrides [DatabaseService], if it exists | ||
63 | // | ||
64 | IConfig gridConfig = config.Configs["GridService"]; | ||
65 | if (gridConfig != null) | ||
66 | { | ||
67 | dllName = gridConfig.GetString("StorageProvider", dllName); | ||
68 | connString = gridConfig.GetString("ConnectionString", connString); | ||
69 | realm = gridConfig.GetString("Realm", realm); | ||
70 | } | ||
71 | |||
72 | // | ||
73 | // We tried, but this doesn't exist. We can't proceed. | 73 | // We tried, but this doesn't exist. We can't proceed. |
74 | // | 74 | // |
75 | if (dllName.Equals(String.Empty)) | 75 | if (dllName.Equals(String.Empty)) |