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/MySQLSimulationData.cs | |
parent | revert to older CSJ2K.dll since new seems have issues on linux with existent... (diff) | |
download | opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.zip opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.gz opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.bz2 opensim-SC_OLD-d9038e650a8cbacc3463c6989b5af1e8429a1e8b.tar.xz |
MySQLConnector is not a MS product
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 5740b91..8d1a4a5 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -88,6 +88,7 @@ namespace OpenSim.Data.MySQL | |||
88 | // | 88 | // |
89 | Migration m = new Migration(dbcon, Assembly, "RegionStore"); | 89 | Migration m = new Migration(dbcon, Assembly, "RegionStore"); |
90 | m.Update(); | 90 | m.Update(); |
91 | dbcon.Close(); | ||
91 | } | 92 | } |
92 | } | 93 | } |
93 | 94 | ||
@@ -334,6 +335,7 @@ namespace OpenSim.Data.MySQL | |||
334 | 335 | ||
335 | ExecuteNonQuery(cmd); | 336 | ExecuteNonQuery(cmd); |
336 | } | 337 | } |
338 | dbcon.Close(); | ||
337 | } | 339 | } |
338 | } | 340 | } |
339 | } | 341 | } |
@@ -372,6 +374,7 @@ namespace OpenSim.Data.MySQL | |||
372 | 374 | ||
373 | ExecuteNonQuery(cmd); | 375 | ExecuteNonQuery(cmd); |
374 | } | 376 | } |
377 | dbcon.Close(); | ||
375 | } | 378 | } |
376 | } | 379 | } |
377 | } | 380 | } |
@@ -411,6 +414,7 @@ namespace OpenSim.Data.MySQL | |||
411 | 414 | ||
412 | ExecuteNonQuery(cmd); | 415 | ExecuteNonQuery(cmd); |
413 | } | 416 | } |
417 | dbcon.Close(); | ||
414 | } | 418 | } |
415 | } | 419 | } |
416 | } | 420 | } |
@@ -460,6 +464,7 @@ namespace OpenSim.Data.MySQL | |||
460 | } | 464 | } |
461 | } | 465 | } |
462 | } | 466 | } |
467 | dbcon.Close(); | ||
463 | } | 468 | } |
464 | } | 469 | } |
465 | 470 | ||
@@ -535,6 +540,7 @@ namespace OpenSim.Data.MySQL | |||
535 | } | 540 | } |
536 | } | 541 | } |
537 | } | 542 | } |
543 | dbcon.Close(); | ||
538 | } | 544 | } |
539 | } | 545 | } |
540 | 546 | ||
@@ -580,6 +586,7 @@ namespace OpenSim.Data.MySQL | |||
580 | } | 586 | } |
581 | } | 587 | } |
582 | } | 588 | } |
589 | dbcon.Close(); | ||
583 | } | 590 | } |
584 | 591 | ||
585 | prim.Inventory.RestoreInventoryItems(inventory); | 592 | prim.Inventory.RestoreInventoryItems(inventory); |
@@ -634,6 +641,7 @@ namespace OpenSim.Data.MySQL | |||
634 | } | 641 | } |
635 | } | 642 | } |
636 | } | 643 | } |
644 | dbcon.Close(); | ||
637 | } | 645 | } |
638 | } | 646 | } |
639 | }); | 647 | }); |
@@ -681,6 +689,7 @@ namespace OpenSim.Data.MySQL | |||
681 | } | 689 | } |
682 | } | 690 | } |
683 | } | 691 | } |
692 | dbcon.Close(); | ||
684 | } | 693 | } |
685 | } | 694 | } |
686 | }); | 695 | }); |
@@ -727,6 +736,7 @@ namespace OpenSim.Data.MySQL | |||
727 | } | 736 | } |
728 | } | 737 | } |
729 | } | 738 | } |
739 | dbcon.Close(); | ||
730 | } | 740 | } |
731 | } | 741 | } |
732 | 742 | ||
@@ -762,6 +772,7 @@ namespace OpenSim.Data.MySQL | |||
762 | } | 772 | } |
763 | } | 773 | } |
764 | } | 774 | } |
775 | dbcon.Close(); | ||
765 | } | 776 | } |
766 | } | 777 | } |
767 | 778 | ||
@@ -783,6 +794,7 @@ namespace OpenSim.Data.MySQL | |||
783 | 794 | ||
784 | ExecuteNonQuery(cmd); | 795 | ExecuteNonQuery(cmd); |
785 | } | 796 | } |
797 | dbcon.Close(); | ||
786 | } | 798 | } |
787 | } | 799 | } |
788 | } | 800 | } |
@@ -842,6 +854,7 @@ namespace OpenSim.Data.MySQL | |||
842 | cmd.Parameters.Clear(); | 854 | cmd.Parameters.Clear(); |
843 | } | 855 | } |
844 | } | 856 | } |
857 | dbcon.Close(); | ||
845 | } | 858 | } |
846 | } | 859 | } |
847 | } | 860 | } |
@@ -939,6 +952,7 @@ namespace OpenSim.Data.MySQL | |||
939 | nWP.valid = true; | 952 | nWP.valid = true; |
940 | } | 953 | } |
941 | } | 954 | } |
955 | dbcon.Close(); | ||
942 | } | 956 | } |
943 | 957 | ||
944 | return nWP; | 958 | return nWP; |
@@ -976,6 +990,7 @@ namespace OpenSim.Data.MySQL | |||
976 | } | 990 | } |
977 | } | 991 | } |
978 | } | 992 | } |
993 | dbcon.Close(); | ||
979 | } | 994 | } |
980 | } | 995 | } |
981 | 996 | ||
@@ -1084,6 +1099,7 @@ namespace OpenSim.Data.MySQL | |||
1084 | 1099 | ||
1085 | ExecuteNonQuery(cmd); | 1100 | ExecuteNonQuery(cmd); |
1086 | } | 1101 | } |
1102 | dbcon.Close(); | ||
1087 | } | 1103 | } |
1088 | } | 1104 | } |
1089 | 1105 | ||
@@ -1099,6 +1115,7 @@ namespace OpenSim.Data.MySQL | |||
1099 | cmd.Parameters.AddWithValue("?regionID", regionID.ToString()); | 1115 | cmd.Parameters.AddWithValue("?regionID", regionID.ToString()); |
1100 | ExecuteNonQuery(cmd); | 1116 | ExecuteNonQuery(cmd); |
1101 | } | 1117 | } |
1118 | dbcon.Close(); | ||
1102 | } | 1119 | } |
1103 | } | 1120 | } |
1104 | 1121 | ||
@@ -1127,6 +1144,7 @@ namespace OpenSim.Data.MySQL | |||
1127 | return Convert.ToString(result["llsd_settings"]); | 1144 | return Convert.ToString(result["llsd_settings"]); |
1128 | } | 1145 | } |
1129 | } | 1146 | } |
1147 | dbcon.Close(); | ||
1130 | } | 1148 | } |
1131 | } | 1149 | } |
1132 | 1150 | ||
@@ -1145,6 +1163,7 @@ namespace OpenSim.Data.MySQL | |||
1145 | 1163 | ||
1146 | ExecuteNonQuery(cmd); | 1164 | ExecuteNonQuery(cmd); |
1147 | } | 1165 | } |
1166 | dbcon.Close(); | ||
1148 | } | 1167 | } |
1149 | } | 1168 | } |
1150 | 1169 | ||
@@ -1160,6 +1179,7 @@ namespace OpenSim.Data.MySQL | |||
1160 | cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString()); | 1179 | cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString()); |
1161 | ExecuteNonQuery(cmd); | 1180 | ExecuteNonQuery(cmd); |
1162 | } | 1181 | } |
1182 | dbcon.Close(); | ||
1163 | } | 1183 | } |
1164 | } | 1184 | } |
1165 | #endregion | 1185 | #endregion |
@@ -1212,7 +1232,7 @@ namespace OpenSim.Data.MySQL | |||
1212 | FillRegionSettingsCommand(cmd, rs); | 1232 | FillRegionSettingsCommand(cmd, rs); |
1213 | ExecuteNonQuery(cmd); | 1233 | ExecuteNonQuery(cmd); |
1214 | } | 1234 | } |
1215 | 1235 | dbcon.Close(); | |
1216 | SaveSpawnPoints(rs); | 1236 | SaveSpawnPoints(rs); |
1217 | } | 1237 | } |
1218 | } | 1238 | } |
@@ -1259,6 +1279,7 @@ namespace OpenSim.Data.MySQL | |||
1259 | } | 1279 | } |
1260 | } | 1280 | } |
1261 | } | 1281 | } |
1282 | dbcon.Close(); | ||
1262 | } | 1283 | } |
1263 | } | 1284 | } |
1264 | 1285 | ||
@@ -2123,6 +2144,7 @@ namespace OpenSim.Data.MySQL | |||
2123 | ExecuteNonQuery(cmd); | 2144 | ExecuteNonQuery(cmd); |
2124 | } | 2145 | } |
2125 | } | 2146 | } |
2147 | dbcon.Close(); | ||
2126 | } | 2148 | } |
2127 | } | 2149 | } |
2128 | } | 2150 | } |
@@ -2152,6 +2174,7 @@ namespace OpenSim.Data.MySQL | |||
2152 | } | 2174 | } |
2153 | } | 2175 | } |
2154 | } | 2176 | } |
2177 | dbcon.Close(); | ||
2155 | } | 2178 | } |
2156 | } | 2179 | } |
2157 | 2180 | ||
@@ -2187,6 +2210,7 @@ namespace OpenSim.Data.MySQL | |||
2187 | } | 2210 | } |
2188 | } | 2211 | } |
2189 | } | 2212 | } |
2213 | dbcon.Close(); | ||
2190 | } | 2214 | } |
2191 | } | 2215 | } |
2192 | } | 2216 | } |
@@ -2221,6 +2245,7 @@ namespace OpenSim.Data.MySQL | |||
2221 | cmd.Parameters.Clear(); | 2245 | cmd.Parameters.Clear(); |
2222 | } | 2246 | } |
2223 | } | 2247 | } |
2248 | dbcon.Close(); | ||
2224 | } | 2249 | } |
2225 | } | 2250 | } |
2226 | } | 2251 | } |
@@ -2240,6 +2265,7 @@ namespace OpenSim.Data.MySQL | |||
2240 | 2265 | ||
2241 | cmd.ExecuteNonQuery(); | 2266 | cmd.ExecuteNonQuery(); |
2242 | } | 2267 | } |
2268 | dbcon.Close(); | ||
2243 | } | 2269 | } |
2244 | } | 2270 | } |
2245 | 2271 | ||
@@ -2257,6 +2283,7 @@ namespace OpenSim.Data.MySQL | |||
2257 | 2283 | ||
2258 | cmd.ExecuteNonQuery(); | 2284 | cmd.ExecuteNonQuery(); |
2259 | } | 2285 | } |
2286 | dbcon.Close(); | ||
2260 | } | 2287 | } |
2261 | } | 2288 | } |
2262 | 2289 | ||
@@ -2280,6 +2307,7 @@ namespace OpenSim.Data.MySQL | |||
2280 | } | 2307 | } |
2281 | } | 2308 | } |
2282 | } | 2309 | } |
2310 | dbcon.Close(); | ||
2283 | } | 2311 | } |
2284 | 2312 | ||
2285 | return ret; | 2313 | return ret; |