diff options
| author | dahlia | 2013-06-28 14:03:46 -0700 |
|---|---|---|
| committer | dahlia | 2013-06-28 14:03:46 -0700 |
| commit | 4cb4c9fb25f15d05c269e1796571795e46b7074e (patch) | |
| tree | 820d89c1afdbd987b66f4b37013e72e493ba8b6e /OpenSim/Data | |
| parent | add some locking to materials storage dictionary (diff) | |
| parent | Remove "Asset deletion not supported by database" message from "delete asset"... (diff) | |
| download | opensim-SC_OLD-4cb4c9fb25f15d05c269e1796571795e46b7074e.zip opensim-SC_OLD-4cb4c9fb25f15d05c269e1796571795e46b7074e.tar.gz opensim-SC_OLD-4cb4c9fb25f15d05c269e1796571795e46b7074e.tar.bz2 opensim-SC_OLD-4cb4c9fb25f15d05c269e1796571795e46b7074e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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)) |