diff options
author | UbitUmarov | 2017-05-06 01:25:54 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-06 01:25:54 +0100 |
commit | d9038e650a8cbacc3463c6989b5af1e8429a1e8b (patch) | |
tree | 5d1b31679650853bf9710c96dcda6bd0f45096aa /OpenSim/Data/MySQL/MySQLInventoryData.cs | |
parent | revert to older CSJ2K.dll since new seems have issues on linux with existent... (diff) | |
download | opensim-SC-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.zip opensim-SC-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.gz opensim-SC-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.bz2 opensim-SC-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.xz |
MySQLConnector is not a MS product
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 382d4a5..3216544 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -78,6 +78,7 @@ namespace OpenSim.Data.MySQL | |||
78 | dbcon.Open(); | 78 | dbcon.Open(); |
79 | Migration m = new Migration(dbcon, assem, "InventoryStore"); | 79 | Migration m = new Migration(dbcon, assem, "InventoryStore"); |
80 | m.Update(); | 80 | m.Update(); |
81 | dbcon.Close(); | ||
81 | } | 82 | } |
82 | } | 83 | } |
83 | 84 | ||
@@ -133,6 +134,7 @@ namespace OpenSim.Data.MySQL | |||
133 | return items; | 134 | return items; |
134 | } | 135 | } |
135 | } | 136 | } |
137 | dbcon.Close(); | ||
136 | } | 138 | } |
137 | } | 139 | } |
138 | } | 140 | } |
@@ -173,6 +175,7 @@ namespace OpenSim.Data.MySQL | |||
173 | return items; | 175 | return items; |
174 | } | 176 | } |
175 | } | 177 | } |
178 | dbcon.Close(); | ||
176 | } | 179 | } |
177 | } | 180 | } |
178 | } | 181 | } |
@@ -224,6 +227,7 @@ namespace OpenSim.Data.MySQL | |||
224 | return rootFolder; | 227 | return rootFolder; |
225 | } | 228 | } |
226 | } | 229 | } |
230 | dbcon.Close(); | ||
227 | } | 231 | } |
228 | } | 232 | } |
229 | } | 233 | } |
@@ -264,6 +268,7 @@ namespace OpenSim.Data.MySQL | |||
264 | return items; | 268 | return items; |
265 | } | 269 | } |
266 | } | 270 | } |
271 | dbcon.Close(); | ||
267 | } | 272 | } |
268 | } | 273 | } |
269 | } | 274 | } |
@@ -355,6 +360,7 @@ namespace OpenSim.Data.MySQL | |||
355 | return item; | 360 | return item; |
356 | } | 361 | } |
357 | } | 362 | } |
363 | dbcon.Close(); | ||
358 | } | 364 | } |
359 | } | 365 | } |
360 | } | 366 | } |
@@ -420,6 +426,7 @@ namespace OpenSim.Data.MySQL | |||
420 | return folder; | 426 | return folder; |
421 | } | 427 | } |
422 | } | 428 | } |
429 | dbcon.Close(); | ||
423 | } | 430 | } |
424 | } | 431 | } |
425 | } | 432 | } |
@@ -497,6 +504,8 @@ namespace OpenSim.Data.MySQL | |||
497 | result.Dispose(); | 504 | result.Dispose(); |
498 | } | 505 | } |
499 | 506 | ||
507 | dbcon.Close(); | ||
508 | |||
500 | using (MySqlCommand result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon)) | 509 | using (MySqlCommand result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon)) |
501 | { | 510 | { |
502 | result.Parameters.AddWithValue("?folderID", item.Folder.ToString()); | 511 | result.Parameters.AddWithValue("?folderID", item.Folder.ToString()); |
@@ -540,6 +549,7 @@ namespace OpenSim.Data.MySQL | |||
540 | lock (m_dbLock) | 549 | lock (m_dbLock) |
541 | cmd.ExecuteNonQuery(); | 550 | cmd.ExecuteNonQuery(); |
542 | } | 551 | } |
552 | dbcon.Close(); | ||
543 | } | 553 | } |
544 | } | 554 | } |
545 | catch (MySqlException e) | 555 | catch (MySqlException e) |
@@ -600,6 +610,7 @@ namespace OpenSim.Data.MySQL | |||
600 | m_log.Error(e.ToString()); | 610 | m_log.Error(e.ToString()); |
601 | } | 611 | } |
602 | } | 612 | } |
613 | dbcon.Close(); | ||
603 | } | 614 | } |
604 | } | 615 | } |
605 | 616 | ||
@@ -643,6 +654,7 @@ namespace OpenSim.Data.MySQL | |||
643 | m_log.Error(e.ToString()); | 654 | m_log.Error(e.ToString()); |
644 | } | 655 | } |
645 | } | 656 | } |
657 | dbcon.Close(); | ||
646 | } | 658 | } |
647 | } | 659 | } |
648 | 660 | ||
@@ -806,6 +818,7 @@ namespace OpenSim.Data.MySQL | |||
806 | lock (m_dbLock) | 818 | lock (m_dbLock) |
807 | cmd.ExecuteNonQuery(); | 819 | cmd.ExecuteNonQuery(); |
808 | } | 820 | } |
821 | dbcon.Close(); | ||
809 | } | 822 | } |
810 | } | 823 | } |
811 | catch (MySqlException e) | 824 | catch (MySqlException e) |
@@ -833,6 +846,7 @@ namespace OpenSim.Data.MySQL | |||
833 | lock (m_dbLock) | 846 | lock (m_dbLock) |
834 | cmd.ExecuteNonQuery(); | 847 | cmd.ExecuteNonQuery(); |
835 | } | 848 | } |
849 | dbcon.Close(); | ||
836 | } | 850 | } |
837 | } | 851 | } |
838 | catch (MySqlException e) | 852 | catch (MySqlException e) |
@@ -889,6 +903,7 @@ namespace OpenSim.Data.MySQL | |||
889 | return list; | 903 | return list; |
890 | } | 904 | } |
891 | } | 905 | } |
906 | dbcon.Close(); | ||
892 | } | 907 | } |
893 | } | 908 | } |
894 | catch (Exception e) | 909 | catch (Exception e) |