Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
index 05eb125..e62bcb5 100644
--- a/OpenSim/Services/AssetService/XAssetService.cs
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -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;