diff options
author | Justin Clarke Casey | 2008-04-18 22:46:03 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-18 22:46:03 +0000 |
commit | f0896c263bea162a64367e5d3c86daeb7cc91a7b (patch) | |
tree | 621b07e5f805e316daa5016eda4e9b3d4c0d41e2 /OpenSim/Data/MySQL/MySQLInventoryData.cs | |
parent | From: Alan M Webb <awebb@vnet.ibm.com> (diff) | |
download | opensim-SC-f0896c263bea162a64367e5d3c86daeb7cc91a7b.zip opensim-SC-f0896c263bea162a64367e5d3c86daeb7cc91a7b.tar.gz opensim-SC-f0896c263bea162a64367e5d3c86daeb7cc91a7b.tar.bz2 opensim-SC-f0896c263bea162a64367e5d3c86daeb7cc91a7b.tar.xz |
* Insert some missing database locks for inventory and user data on mysql
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index ce9829a..82bbf4f 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -458,7 +458,12 @@ namespace OpenSim.Data.MySQL | |||
458 | result.Parameters.AddWithValue("?creatorID", item.Creator.ToString()); | 458 | result.Parameters.AddWithValue("?creatorID", item.Creator.ToString()); |
459 | result.Parameters.AddWithValue("?inventoryBasePermissions", item.BasePermissions); | 459 | result.Parameters.AddWithValue("?inventoryBasePermissions", item.BasePermissions); |
460 | result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions); | 460 | result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions); |
461 | result.ExecuteNonQuery(); | 461 | |
462 | lock (database) | ||
463 | { | ||
464 | result.ExecuteNonQuery(); | ||
465 | } | ||
466 | |||
462 | result.Dispose(); | 467 | result.Dispose(); |
463 | } | 468 | } |
464 | catch (MySqlException e) | 469 | catch (MySqlException e) |
@@ -487,7 +492,11 @@ namespace OpenSim.Data.MySQL | |||
487 | MySqlCommand cmd = | 492 | MySqlCommand cmd = |
488 | new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", database.Connection); | 493 | new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", database.Connection); |
489 | cmd.Parameters.AddWithValue("?uuid", itemID.ToString()); | 494 | cmd.Parameters.AddWithValue("?uuid", itemID.ToString()); |
490 | cmd.ExecuteNonQuery(); | 495 | |
496 | lock (database) | ||
497 | { | ||
498 | cmd.ExecuteNonQuery(); | ||
499 | } | ||
491 | } | 500 | } |
492 | catch (MySqlException e) | 501 | catch (MySqlException e) |
493 | { | 502 | { |