aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-18 20:09:43 -0700
committerDiva Canto2009-09-18 20:09:43 -0700
commit15d6bb4ce55092d2ee0a27bbb3ec5e7760a05dcc (patch)
treefa35c1c496661763dba405e422597548742c0359
parentFirst pass at LocalGridServiceConnector. Nothing of this is used by the simul... (diff)
downloadopensim-SC_OLD-15d6bb4ce55092d2ee0a27bbb3ec5e7760a05dcc.zip
opensim-SC_OLD-15d6bb4ce55092d2ee0a27bbb3ec5e7760a05dcc.tar.gz
opensim-SC_OLD-15d6bb4ce55092d2ee0a27bbb3ec5e7760a05dcc.tar.bz2
opensim-SC_OLD-15d6bb4ce55092d2ee0a27bbb3ec5e7760a05dcc.tar.xz
Reverted the order of reading configs in GridServiceBase.
-rw-r--r--OpenSim/Services/GridService/GridServiceBase.cs22
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))