diff options
| author | Melanie | 2013-06-30 18:27:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-30 18:27:30 +0100 |
| commit | ffcee82b1d62150b772464841023a29acc334c84 (patch) | |
| tree | 957d562be1f9e567daabb9bfdd25e779ec2c11a4 /OpenSim/Data/MySQL/MySQLXAssetData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Groups V2: charge for group creation only after the group has been successful... (diff) | |
| download | opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.zip opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.gz opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.bz2 opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLXAssetData.cs')
| -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 15ac921..5f1d2ee 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)) |