diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLManager.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 58599a8..6ad6609 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Data.MySQL | |||
55 | private string connectionString; | 55 | private string connectionString; |
56 | 56 | ||
57 | private const string m_waitTimeoutSelect = "select @@wait_timeout"; | 57 | private const string m_waitTimeoutSelect = "select @@wait_timeout"; |
58 | 58 | ||
59 | /// <summary> | 59 | /// <summary> |
60 | /// Wait timeout for our connection in ticks. | 60 | /// Wait timeout for our connection in ticks. |
61 | /// </summary> | 61 | /// </summary> |
@@ -70,7 +70,7 @@ namespace OpenSim.Data.MySQL | |||
70 | /// <summary> | 70 | /// <summary> |
71 | /// Holds the last tick time that the connection was used. | 71 | /// Holds the last tick time that the connection was used. |
72 | /// </summary> | 72 | /// </summary> |
73 | private long m_lastConnectionUse; | 73 | private long m_lastConnectionUse; |
74 | 74 | ||
75 | /// <summary> | 75 | /// <summary> |
76 | /// Initialises and creates a new MySQL connection and maintains it. | 76 | /// Initialises and creates a new MySQL connection and maintains it. |
@@ -172,7 +172,7 @@ namespace OpenSim.Data.MySQL | |||
172 | // inaccuracy. | 172 | // inaccuracy. |
173 | m_lastConnectionUse = timeNow; | 173 | m_lastConnectionUse = timeNow; |
174 | } | 174 | } |
175 | 175 | ||
176 | /// <summary> | 176 | /// <summary> |
177 | /// Get the connection being used | 177 | /// Get the connection being used |
178 | /// </summary> | 178 | /// </summary> |
@@ -287,14 +287,14 @@ namespace OpenSim.Data.MySQL | |||
287 | { | 287 | { |
288 | lock (dbcon) | 288 | lock (dbcon) |
289 | { | 289 | { |
290 | CheckConnection(); | 290 | CheckConnection(); |
291 | 291 | ||
292 | MySqlCommand tablesCmd = | 292 | MySqlCommand tablesCmd = |
293 | new MySqlCommand( | 293 | new MySqlCommand( |
294 | "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=?dbname", | 294 | "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=?dbname", |
295 | dbcon); | 295 | dbcon); |
296 | tablesCmd.Parameters.AddWithValue("?dbname", dbcon.Database); | 296 | tablesCmd.Parameters.AddWithValue("?dbname", dbcon.Database); |
297 | 297 | ||
298 | using (MySqlDataReader tables = tablesCmd.ExecuteReader()) | 298 | using (MySqlDataReader tables = tablesCmd.ExecuteReader()) |
299 | { | 299 | { |
300 | while (tables.Read()) | 300 | while (tables.Read()) |
@@ -541,7 +541,7 @@ namespace OpenSim.Data.MySQL | |||
541 | LLUUID regionID = LLUUID.Zero; | 541 | LLUUID regionID = LLUUID.Zero; |
542 | LLUUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero | 542 | LLUUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero |
543 | retval.HomeRegionID = regionID; | 543 | retval.HomeRegionID = regionID; |
544 | 544 | ||
545 | retval.Created = Convert.ToInt32(reader["created"].ToString()); | 545 | retval.Created = Convert.ToInt32(reader["created"].ToString()); |
546 | retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); | 546 | retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); |
547 | 547 | ||
@@ -1124,7 +1124,7 @@ namespace OpenSim.Data.MySQL | |||
1124 | sql += "?skirt_item, ?skirt_asset)"; | 1124 | sql += "?skirt_item, ?skirt_asset)"; |
1125 | 1125 | ||
1126 | bool returnval = false; | 1126 | bool returnval = false; |
1127 | 1127 | ||
1128 | // we want to send in byte data, which means we can't just pass down strings | 1128 | // we want to send in byte data, which means we can't just pass down strings |
1129 | try { | 1129 | try { |
1130 | MySqlCommand cmd = (MySqlCommand) dbcon.CreateCommand(); | 1130 | MySqlCommand cmd = (MySqlCommand) dbcon.CreateCommand(); |
@@ -1160,7 +1160,7 @@ namespace OpenSim.Data.MySQL | |||
1160 | cmd.Parameters.AddWithValue("?underpants_asset", appearance.UnderPantsAsset.ToString()); | 1160 | cmd.Parameters.AddWithValue("?underpants_asset", appearance.UnderPantsAsset.ToString()); |
1161 | cmd.Parameters.AddWithValue("?skirt_item", appearance.SkirtItem.ToString()); | 1161 | cmd.Parameters.AddWithValue("?skirt_item", appearance.SkirtItem.ToString()); |
1162 | cmd.Parameters.AddWithValue("?skirt_asset", appearance.SkirtAsset.ToString()); | 1162 | cmd.Parameters.AddWithValue("?skirt_asset", appearance.SkirtAsset.ToString()); |
1163 | 1163 | ||
1164 | if (cmd.ExecuteNonQuery() > 0) | 1164 | if (cmd.ExecuteNonQuery() > 0) |
1165 | returnval = true; | 1165 | returnval = true; |
1166 | 1166 | ||