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

Conflicts:
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so

2 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 1427e84..96b430d 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -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;
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;