aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-15 23:03:02 +0100
committerJustin Clark-Casey (justincc)2010-09-15 23:03:02 +0100
commite6bc77d832812ed1e51ee643638c680f520b25d0 (patch)
treefb295d46ba4c11a8e15e077974c03906569c5295 /OpenSim
parentrename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co... (diff)
parentMark up OpenSim.ini.example for use with an automatic configuration tool. (diff)
downloadopensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.zip
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.gz
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.bz2
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Simulation/EstateDataService.cs13
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationDataService.cs8
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
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); 65 }
66
67 // Try reading the [EstateDataStore] section, if it exists
68 IConfig estConfig = config.Configs["EstateDataStore"];
69 if (estConfig != null)
70 {
71 dllName = estConfig.GetString("StorageProvider", dllName);
72 connString = estConfig.GetString("ConnectionString", connString);
66 } 73 }
67 74
68 // We tried, but this doesn't exist. We can't proceed 75 // 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
63 connString = dbConfig.GetString("ConnectionString", String.Empty); 63 connString = dbConfig.GetString("ConnectionString", String.Empty);
64 } 64 }
65 65
66 // Try reading the [SimulationDataStore] section
67 IConfig simConfig = config.Configs["SimulationDataStore"];
68 if (simConfig != null)
69 {
70 dllName = simConfig.GetString("StorageProvider", dllName);
71 connString = simConfig.GetString("ConnectionString", connString);
72 }
73
66 // We tried, but this doesn't exist. We can't proceed 74 // We tried, but this doesn't exist. We can't proceed
67 if (dllName == String.Empty) 75 if (dllName == String.Empty)
68 throw new Exception("No StorageProvider configured"); 76 throw new Exception("No StorageProvider configured");