diff options
| author | Melanie Thielker | 2008-09-06 14:58:23 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-09-06 14:58:23 +0000 |
| commit | 9e545c9984790ddeabba0bf86e229af90da09ad6 (patch) | |
| tree | bf305b155bcd2aadc1fb8a209d262a86f676fca3 /OpenSim/Data/MySQL | |
| parent | * Replace a Try/catch I commented out while testing/fixing issues. (diff) | |
| download | opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.zip opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.gz opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.bz2 opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.xz | |
Mantis #2133
Thank you, Xugu Madison and ChrisDown, for a patch that
fixes linux filename extensions from .Xml back to .xml
Diffstat (limited to 'OpenSim/Data/MySQL')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLGridData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLLogData.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index fa5b33c..4e4d32c 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs | |||
| @@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL | |||
| 121 | } | 121 | } |
| 122 | else | 122 | else |
| 123 | { | 123 | { |
| 124 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead"); | 124 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); |
| 125 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 125 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
| 126 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); | 126 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); |
| 127 | string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); | 127 | string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); |
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs index 07ef916..c02016c 100644 --- a/OpenSim/Data/MySQL/MySQLLogData.cs +++ b/OpenSim/Data/MySQL/MySQLLogData.cs | |||
| @@ -63,7 +63,7 @@ namespace OpenSim.Data.MySQL | |||
| 63 | } | 63 | } |
| 64 | else | 64 | else |
| 65 | { | 65 | { |
| 66 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead"); | 66 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); |
| 67 | 67 | ||
| 68 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 68 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
| 69 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); | 69 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); |