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 | |
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')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGridData.cs | 12 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLogData.cs | 14 |
3 files changed, 16 insertions, 12 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(); |
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 74afe4f..8e160b7 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Data.MySQL | |||
50 | 50 | ||
51 | public void Initialise(string connect) | 51 | public void Initialise(string connect) |
52 | { | 52 | { |
53 | if(connect != String.Empty) | 53 | if (connect != String.Empty) |
54 | { | 54 | { |
55 | database = new MySQLManager(connect); | 55 | database = new MySQLManager(connect); |
56 | } | 56 | } |
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs index 0873066..2bd246a 100644 --- a/OpenSim/Data/MySQL/MySQLLogData.cs +++ b/OpenSim/Data/MySQL/MySQLLogData.cs | |||
@@ -34,7 +34,7 @@ namespace OpenSim.Data.MySQL | |||
34 | /// An interface to the log database for MySQL | 34 | /// An interface to the log database for MySQL |
35 | /// </summary> | 35 | /// </summary> |
36 | internal class MySQLLogData : ILogData | 36 | internal class MySQLLogData : ILogData |
37 | { | 37 | { |
38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
39 | /// <summary> | 39 | /// <summary> |
40 | /// The database manager | 40 | /// The database manager |
@@ -46,9 +46,12 @@ namespace OpenSim.Data.MySQL | |||
46 | /// </summary> | 46 | /// </summary> |
47 | public void Initialise(string connect) | 47 | public void Initialise(string connect) |
48 | { | 48 | { |
49 | if (connect != String.Empty) { | 49 | if (connect != String.Empty) |
50 | { | ||
50 | database = new MySQLManager(connect); | 51 | database = new MySQLManager(connect); |
51 | } else { | 52 | } |
53 | else | ||
54 | { | ||
52 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); | 55 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); |
53 | 56 | ||
54 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 57 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
@@ -59,9 +62,8 @@ namespace OpenSim.Data.MySQL | |||
59 | string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); | 62 | string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); |
60 | string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); | 63 | string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); |
61 | 64 | ||
62 | database = | 65 | database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, |
63 | new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, | 66 | settingPooling, settingPort); |
64 | settingPort); | ||
65 | } | 67 | } |
66 | } | 68 | } |
67 | 69 | ||