diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLEstateData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index a5c8d24..12593f6 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs | |||
@@ -171,12 +171,13 @@ namespace OpenSim.Data.MySQL | |||
171 | } | 171 | } |
172 | } | 172 | } |
173 | } | 173 | } |
174 | |||
175 | if (!found && create) | 174 | if (!found && create) |
176 | { | 175 | { |
177 | DoCreate(es); | 176 | DoCreate(es); |
178 | LinkRegion(regionID, (int)es.EstateID); | 177 | LinkRegion(regionID, (int)es.EstateID); |
179 | } | 178 | } |
179 | cmd.Connection = null; | ||
180 | dbcon.Close(); | ||
180 | } | 181 | } |
181 | 182 | ||
182 | LoadBanList(es); | 183 | LoadBanList(es); |
@@ -231,6 +232,7 @@ namespace OpenSim.Data.MySQL | |||
231 | 232 | ||
232 | es.Save(); | 233 | es.Save(); |
233 | } | 234 | } |
235 | dbcon.Close(); | ||
234 | } | 236 | } |
235 | } | 237 | } |
236 | 238 | ||
@@ -263,6 +265,7 @@ namespace OpenSim.Data.MySQL | |||
263 | 265 | ||
264 | cmd.ExecuteNonQuery(); | 266 | cmd.ExecuteNonQuery(); |
265 | } | 267 | } |
268 | dbcon.Close(); | ||
266 | } | 269 | } |
267 | 270 | ||
268 | SaveBanList(es); | 271 | SaveBanList(es); |
@@ -300,6 +303,7 @@ namespace OpenSim.Data.MySQL | |||
300 | } | 303 | } |
301 | } | 304 | } |
302 | } | 305 | } |
306 | dbcon.Close(); | ||
303 | } | 307 | } |
304 | } | 308 | } |
305 | 309 | ||
@@ -329,6 +333,7 @@ namespace OpenSim.Data.MySQL | |||
329 | cmd.Parameters.Clear(); | 333 | cmd.Parameters.Clear(); |
330 | } | 334 | } |
331 | } | 335 | } |
336 | dbcon.Close(); | ||
332 | } | 337 | } |
333 | } | 338 | } |
334 | 339 | ||
@@ -358,6 +363,7 @@ namespace OpenSim.Data.MySQL | |||
358 | cmd.Parameters.Clear(); | 363 | cmd.Parameters.Clear(); |
359 | } | 364 | } |
360 | } | 365 | } |
366 | dbcon.Close(); | ||
361 | } | 367 | } |
362 | } | 368 | } |
363 | 369 | ||
@@ -383,6 +389,7 @@ namespace OpenSim.Data.MySQL | |||
383 | } | 389 | } |
384 | } | 390 | } |
385 | } | 391 | } |
392 | dbcon.Close(); | ||
386 | } | 393 | } |
387 | 394 | ||
388 | return uuids.ToArray(); | 395 | return uuids.ToArray(); |
@@ -437,7 +444,6 @@ namespace OpenSim.Data.MySQL | |||
437 | reader.Close(); | 444 | reader.Close(); |
438 | } | 445 | } |
439 | } | 446 | } |
440 | |||
441 | dbcon.Close(); | 447 | dbcon.Close(); |
442 | } | 448 | } |
443 | 449 | ||
@@ -466,7 +472,6 @@ namespace OpenSim.Data.MySQL | |||
466 | reader.Close(); | 472 | reader.Close(); |
467 | } | 473 | } |
468 | } | 474 | } |
469 | |||
470 | dbcon.Close(); | 475 | dbcon.Close(); |
471 | } | 476 | } |
472 | 477 | ||