Merge branch 'master' into presence-refactor

2 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index df33db2..a91b632 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -76,17 +76,19 @@ namespace OpenSim.Services.AssetService
                             });
                 }
                 
-                m_log.Info("[ASSET CONNECTOR]: Local asset service enabled");
+                m_log.Info("[ASSET SERVICE]: Local asset service enabled");
             }
         }
 
         public AssetBase Get(string id)
-        {
-            //m_log.DebugFormat("[ASSET SERVICE]: Get asset {0}", id);
+        {                        
             UUID assetID;
 
             if (!UUID.TryParse(id, out assetID))
+            {
+                m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested sset id {0}", id);                
                 return null;
+            }
 
             return m_Database.GetAsset(assetID);
         }
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 8e311d7..6d442b7 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Services.Connectors
         }
 
         public AssetBase Get(string id)
-        {
+        {            
             string uri = m_ServerURI + "/assets/" + id;
 
             AssetBase asset = null;