diff options
author | Jeff Ames | 2008-05-30 08:35:57 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-30 08:35:57 +0000 |
commit | 04625109560fb54d613b1fc9c81a8a9f387720c9 (patch) | |
tree | af00035a676beee3542a55cd13ce09e57f1ad778 /OpenSim/Data/MySQL/MySQLGridData.cs | |
parent | thanks krtaylor for a (diff) | |
download | opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.zip opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.gz opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.bz2 opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLGridData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGridData.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index 421c283..86ceffc 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs | |||
@@ -53,9 +53,12 @@ namespace OpenSim.Data.MySQL | |||
53 | /// </summary> | 53 | /// </summary> |
54 | override public void Initialise(string connect) | 54 | override public void Initialise(string connect) |
55 | { | 55 | { |
56 | if (connect != String.Empty) { | 56 | if (connect != String.Empty) |
57 | { | ||
57 | database = new MySQLManager(connect); | 58 | database = new MySQLManager(connect); |
58 | } else { | 59 | } |
60 | else | ||
61 | { | ||
59 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); | 62 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); |
60 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 63 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
61 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); | 64 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); |
@@ -65,9 +68,8 @@ namespace OpenSim.Data.MySQL | |||
65 | string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); | 68 | string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); |
66 | string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); | 69 | string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); |
67 | 70 | ||
68 | database = | 71 | database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, |
69 | new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, | 72 | settingPooling, settingPort); |
70 | settingPort); | ||
71 | } | 73 | } |
72 | 74 | ||
73 | TestTables(); | 75 | TestTables(); |