Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
UbitUmarov 2012-03-09 03:32:49 +00:00
commit eaef84ad1d
1 changed files with 5 additions and 4 deletions

View File

@ -190,7 +190,7 @@ namespace OpenSim.Data.MySQL
/// </summary>
/// <param name="asset">Asset UUID to create</param>
/// <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)
{
@ -265,7 +265,7 @@ namespace OpenSim.Data.MySQL
transaction.Rollback();
return;
return false;
}
if (!ExistsData(dbcon, transaction, hash))
@ -289,7 +289,7 @@ namespace OpenSim.Data.MySQL
transaction.Rollback();
return;
return false;
}
}
@ -297,6 +297,7 @@ namespace OpenSim.Data.MySQL
}
}
}
return true;
}
// private void UpdateAccessTime(AssetBase asset)
@ -497,4 +498,4 @@ namespace OpenSim.Data.MySQL
#endregion
}
}
}