Merge branch 'careminster' into avination

This commit is contained in:
Melanie
2012-08-03 16:48:06 +01:00
20 changed files with 465 additions and 305 deletions

View File

@@ -194,7 +194,8 @@ namespace OpenSim.Services.AssetService
public virtual bool Delete(string id)
{
m_log.DebugFormat("[ASSET SERVICE]: Deleting asset {0}", id);
// m_log.DebugFormat("[ASSET SERVICE]: Deleting asset {0}", id);
UUID assetID;
if (!UUID.TryParse(id, out assetID))
return false;

View File

@@ -188,7 +188,8 @@ namespace OpenSim.Services.AssetService
public virtual bool Delete(string id)
{
m_log.DebugFormat("[XASSET SERVICE]: Deleting asset {0}", id);
// m_log.DebugFormat("[XASSET SERVICE]: Deleting asset {0}", id);
UUID assetID;
if (!UUID.TryParse(id, out assetID))
return false;