aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL
diff options
context:
space:
mode:
authorSean Dague2008-05-28 17:59:46 +0000
committerSean Dague2008-05-28 17:59:46 +0000
commit89c164fbc18e082bf2d036bd2167b824e90aebc1 (patch)
tree9042b06429cb3941b04f79af084c13d022d861e7 /OpenSim/Data/MSSQL
parent* Minor: Another small log adjustment (diff)
downloadopensim-SC-89c164fbc18e082bf2d036bd2167b824e90aebc1.zip
opensim-SC-89c164fbc18e082bf2d036bd2167b824e90aebc1.tar.gz
opensim-SC-89c164fbc18e082bf2d036bd2167b824e90aebc1.tar.bz2
opensim-SC-89c164fbc18e082bf2d036bd2167b824e90aebc1.tar.xz
let Grid Servers specify a connect string in their configuration.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs3
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLogData.cs3
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 0bdd460..d7adb84 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -53,8 +53,9 @@ namespace OpenSim.Data.MSSQL
53 /// <summary> 53 /// <summary>
54 /// Initialises the Grid Interface 54 /// Initialises the Grid Interface
55 /// </summary> 55 /// </summary>
56 override public void Initialise() 56 override public void Initialise(string connect)
57 { 57 {
58 // TODO: make the connect string actually do something
58 IniFile iniFile = new IniFile("mssql_connection.ini"); 59 IniFile iniFile = new IniFile("mssql_connection.ini");
59 60
60 string settingDataSource = iniFile.ParseFileReadValue("data_source"); 61 string settingDataSource = iniFile.ParseFileReadValue("data_source");
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs
index 2bb5839..c75290e 100644
--- a/OpenSim/Data/MSSQL/MSSQLLogData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs
@@ -43,8 +43,9 @@ namespace OpenSim.Data.MSSQL
43 /// <summary> 43 /// <summary>
44 /// Artificial constructor called when the plugin is loaded 44 /// Artificial constructor called when the plugin is loaded
45 /// </summary> 45 /// </summary>
46 public void Initialise() 46 public void Initialise(string connect)
47 { 47 {
48 // TODO: do something with the connect string
48 IniFile GridDataMySqlFile = new IniFile("mssql_connection.ini"); 49 IniFile GridDataMySqlFile = new IniFile("mssql_connection.ini");
49 string settingDataSource = GridDataMySqlFile.ParseFileReadValue("data_source"); 50 string settingDataSource = GridDataMySqlFile.ParseFileReadValue("data_source");
50 string settingInitialCatalog = GridDataMySqlFile.ParseFileReadValue("initial_catalog"); 51 string settingInitialCatalog = GridDataMySqlFile.ParseFileReadValue("initial_catalog");