aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorMelanie2010-09-14 23:05:42 +0100
committerMelanie2010-09-14 23:05:42 +0100
commit7f7bbbb84a42d7fd984b637eaf7f1ce115d5fe19 (patch)
treefacedf5c7b7f87f4201127f7d71df757c47c04a0 /OpenSim/Services/Connectors
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-7f7bbbb84a42d7fd984b637eaf7f1ce115d5fe19.zip
opensim-SC-7f7bbbb84a42d7fd984b637eaf7f1ce115d5fe19.tar.gz
opensim-SC-7f7bbbb84a42d7fd984b637eaf7f1ce115d5fe19.tar.bz2
opensim-SC-7f7bbbb84a42d7fd984b637eaf7f1ce115d5fe19.tar.xz
Fix the above
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/Simulation/EstateDataService.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
index 2eedebb..8a8b46d 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -60,9 +60,8 @@ namespace OpenSim.Services.Connectors
60 if (dbConfig != null) 60 if (dbConfig != null)
61 { 61 {
62 dllName = dbConfig.GetString("StorageProvider", String.Empty); 62 dllName = dbConfig.GetString("StorageProvider", String.Empty);
63 connString = dbConfig.GetString("EstateConnectionString", String.Empty); 63 connString = dbConfig.GetString("ConnectionString", String.Empty);
64 if (String.IsNullOrEmpty(connString)) 64 connString = dbConfig.GetString("EstateConnectionString", connString);
65 connString = dbConfig.GetString("ConnectionString", String.Empty);
66 } 65 }
67 66
68 // Try reading the [EstateDataStore] section, if it exists 67 // Try reading the [EstateDataStore] section, if it exists
@@ -70,7 +69,7 @@ namespace OpenSim.Services.Connectors
70 if (estConfig != null) 69 if (estConfig != null)
71 { 70 {
72 dllName = estConfig.GetString("StorageProvider", dllName); 71 dllName = estConfig.GetString("StorageProvider", dllName);
73 connString = dbConfig.GetString("ConnectionString", connString); 72 connString = estConfig.GetString("ConnectionString", connString);
74 } 73 }
75 74
76 // We tried, but this doesn't exist. We can't proceed 75 // We tried, but this doesn't exist. We can't proceed