diff options
| author | Justin Clark-Casey (justincc) | 2013-06-28 19:11:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-28 19:11:44 +0100 |
| commit | dc0455e217b8da3fc8bd49e959b57d6021312b77 (patch) | |
| tree | 43d40dbb2cd9f7e685d967a740d7c102b433af3d /OpenSim/Data | |
| parent | Reinsert code for gathering uuids reference by materials back directly into U... (diff) | |
| download | opensim-SC_OLD-dc0455e217b8da3fc8bd49e959b57d6021312b77.zip opensim-SC_OLD-dc0455e217b8da3fc8bd49e959b57d6021312b77.tar.gz opensim-SC_OLD-dc0455e217b8da3fc8bd49e959b57d6021312b77.tar.bz2 opensim-SC_OLD-dc0455e217b8da3fc8bd49e959b57d6021312b77.tar.xz | |
In XAssetService, on a delete asset request also delete the asset in any chained service.
This eliminates the async migration since it causes a race condition with the "delete asset" console command
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLXAssetData.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index 8c93825..91389ce 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs | |||
| @@ -199,6 +199,8 @@ namespace OpenSim.Data.MySQL | |||
| 199 | /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> | 199 | /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> |
| 200 | public void StoreAsset(AssetBase asset) | 200 | public void StoreAsset(AssetBase asset) |
| 201 | { | 201 | { |
| 202 | // m_log.DebugFormat("[XASSETS DB]: Storing asset {0} {1}", asset.Name, asset.ID); | ||
| 203 | |||
| 202 | lock (m_dbLock) | 204 | lock (m_dbLock) |
| 203 | { | 205 | { |
| 204 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 206 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) |