From 3275fbec540a09228fe0be05113870fc42639341 Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 14 Sep 2010 23:05:42 +0100 Subject: [PATCH] Fix the above --- .../Services/Connectors/Simulation/EstateDataService.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs index 2eedebbf1a..8a8b46d89b 100644 --- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs @@ -60,9 +60,8 @@ 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 @@ -70,7 +69,7 @@ namespace OpenSim.Services.Connectors if (estConfig != null) { dllName = estConfig.GetString("StorageProvider", dllName); - connString = dbConfig.GetString("ConnectionString", connString); + connString = estConfig.GetString("ConnectionString", connString); } // We tried, but this doesn't exist. We can't proceed