OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a merge artefact

avinationmerge
Melanie 2012-03-09 02:45:53 +00:00
parent dc5f831ca8
commit 99c64f0645
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Data/MySQL/MySQLXAssetData.cs
View File

@ -190,7 +190,7 @@ namespace OpenSim.Data.MySQL
/// </summary> /// </summary>
/// <param name="asset">Asset UUID to create</param> /// <param name="asset">Asset UUID to create</param>
/// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
override public void StoreAsset(AssetBase asset) override public bool StoreAsset(AssetBase asset)
{ {
lock (m_dbLock) lock (m_dbLock)
{ {
@ -265,7 +265,7 @@ namespace OpenSim.Data.MySQL
transaction.Rollback(); transaction.Rollback();
return; return false;
} }
if (!ExistsData(dbcon, transaction, hash)) if (!ExistsData(dbcon, transaction, hash))
@ -289,7 +289,7 @@ namespace OpenSim.Data.MySQL
transaction.Rollback(); transaction.Rollback();
return; return false;
} }
} }
@ -297,6 +297,7 @@ namespace OpenSim.Data.MySQL
} }
} }
} }
return true;
} }
// private void UpdateAccessTime(AssetBase asset) // private void UpdateAccessTime(AssetBase asset)
@ -497,4 +498,4 @@ namespace OpenSim.Data.MySQL
#endregion #endregion
} }
} }