aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLManager.cs
diff options
context:
space:
mode:
authorSean Dague2008-04-24 15:23:49 +0000
committerSean Dague2008-04-24 15:23:49 +0000
commitc6f6218f60db023fb4c124039fd9551bc4754b13 (patch)
tree734ebdae66f0402c6eaa5ce39f7535814d59adc4 /OpenSim/Data/MySQL/MySQLManager.cs
parent* Patch from Melanie. Mantis: 1040. Thanks Melanie! (diff)
downloadopensim-SC-c6f6218f60db023fb4c124039fd9551bc4754b13.zip
opensim-SC-c6f6218f60db023fb4c124039fd9551bc4754b13.tar.gz
opensim-SC-c6f6218f60db023fb4c124039fd9551bc4754b13.tar.bz2
opensim-SC-c6f6218f60db023fb4c124039fd9551bc4754b13.tar.xz
in theory, let you pass the mysql connection string into the
mysql manager class. This could use some testing of inventory and asset services. Once this is prooved out, I'll do it for mssql as well.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs16
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 1e7038f..d522b78 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -65,10 +65,22 @@ namespace OpenSim.Data.MySQL
65 public MySQLManager(string hostname, string database, string username, string password, string cpooling, 65 public MySQLManager(string hostname, string database, string username, string password, string cpooling,
66 string port) 66 string port)
67 { 67 {
68 string s = "Server=" + hostname + ";Port=" + port + ";Database=" + database + ";User ID=" +
69 username + ";Password=" + password + ";Pooling=" + cpooling + ";";
70
71 Initialise(s);
72 }
73
74 public MySQLManager(String connect)
75 {
76 Initialise(connect);
77 }
78
79 public void Initialise(String connect)
80 {
68 try 81 try
69 { 82 {
70 connectionString = "Server=" + hostname + ";Port=" + port + ";Database=" + database + ";User ID=" + 83 connectionString = connect;
71 username + ";Password=" + password + ";Pooling=" + cpooling + ";";
72 dbcon = new MySqlConnection(connectionString); 84 dbcon = new MySqlConnection(connectionString);
73 85
74 try 86 try