diff options
| author | Melanie Thielker | 2014-09-22 18:50:06 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-09-22 18:50:06 +0200 |
| commit | 4cc552162ed898305b2997b841483bd513296af4 (patch) | |
| tree | 7d6ada0ef70a46322eeeb11d8596f7c95a1cc6fb /OpenSim/Data | |
| parent | When a ghosted avatar is removed, also remove any remaining CAPS (diff) | |
| parent | a few more changes on link/unlink (diff) | |
| download | opensim-SC-4cc552162ed898305b2997b841483bd513296af4.zip opensim-SC-4cc552162ed898305b2997b841483bd513296af4.tar.gz opensim-SC-4cc552162ed898305b2997b841483bd513296af4.tar.bz2 opensim-SC-4cc552162ed898305b2997b841483bd513296af4.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index f743663..cc844ae 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -308,7 +308,8 @@ namespace OpenSim.Data.MySQL | |||
| 308 | /// <param name="uuid">the Item UUID</param> | 308 | /// <param name="uuid">the Item UUID</param> |
| 309 | private void RemoveItems(UUID uuid) | 309 | private void RemoveItems(UUID uuid) |
| 310 | { | 310 | { |
| 311 | lock (m_dbLock) | 311 | // locked by caller |
| 312 | // lock (m_dbLock) | ||
| 312 | { | 313 | { |
| 313 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 314 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |
| 314 | { | 315 | { |