Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 18 insertions, 3 deletions

diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
index 87c49d3..8a8b46d 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -60,9 +60,16 @@ namespace OpenSim.Services.Connectors
             if (dbConfig != null)
             {
                 dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                connString = dbConfig.GetString("EstateConnectionString", String.Empty);
-                if (String.IsNullOrEmpty(connString))
-                    connString = dbConfig.GetString("ConnectionString", String.Empty);
+                connString = dbConfig.GetString("ConnectionString", String.Empty);
+                connString = dbConfig.GetString("EstateConnectionString", connString);
+            }
+
+            // Try reading the [EstateDataStore] section, if it exists
+            IConfig estConfig = config.Configs["EstateDataStore"];
+            if (estConfig != null)
+            {
+                dllName = estConfig.GetString("StorageProvider", dllName);
+                connString = estConfig.GetString("ConnectionString", connString);
             }
 
             // We tried, but this doesn't exist. We can't proceed
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index 946f7e4..c8ecb18 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -63,6 +63,14 @@ namespace OpenSim.Services.Connectors
                 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
             if (dllName == String.Empty)
                 throw new Exception("No StorageProvider configured");