ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-03 09:29:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties. Formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2008-05-30 08:35:57 +00:00
parent 5b0d47dddb
commit 0462510956
21 changed files with 403 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Data/MySQL/MySQLGridData.cs
View File

@@ -53,9 +53,12 @@ namespace OpenSim.Data.MySQL
/// </summary>
override public void Initialise(string connect)
{
if (connect != String.Empty) {
if (connect != String.Empty)
{
database = new MySQLManager(connect);
} else {
}
else
{
m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead");
IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
@@ -65,9 +68,8 @@ namespace OpenSim.Data.MySQL
string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
database =
new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling,
settingPort);
database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword,
settingPooling, settingPort);
}
TestTables();