aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authordiva2009-05-23 17:51:13 +0000
committerdiva2009-05-23 17:51:13 +0000
commitfb6d314d4db0a157799a1d49a5f467f1c051ec9b (patch)
tree3a5f7c8d3f91722d6a32ee85b7031dfb4c2de6b0 /OpenSim/Services
parentAdded one missing config var for HG standalones. (diff)
downloadopensim-SC_OLD-fb6d314d4db0a157799a1d49a5f467f1c051ec9b.zip
opensim-SC_OLD-fb6d314d4db0a157799a1d49a5f467f1c051ec9b.tar.gz
opensim-SC_OLD-fb6d314d4db0a157799a1d49a5f467f1c051ec9b.tar.bz2
opensim-SC_OLD-fb6d314d4db0a157799a1d49a5f467f1c051ec9b.tar.xz
This should make HG asset transfers work much better. It now uses HGUuidGatherer, which is a subclass of UuidGatherer. Hence, on-line HG asset transfers use exactly the same UUID collection code as save oar/xml. If it doesn't work, it's Justin's fault :D
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 968cf5c..d1053f1 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Services.AssetService
66 66
67 public AssetBase Get(string id) 67 public AssetBase Get(string id)
68 { 68 {
69 m_log.DebugFormat("[ASSET SERVICE]: Get asset {0}", id); 69 //m_log.DebugFormat("[ASSET SERVICE]: Get asset {0}", id);
70 UUID assetID; 70 UUID assetID;
71 71
72 if (!UUID.TryParse(id, out assetID)) 72 if (!UUID.TryParse(id, out assetID))
@@ -99,7 +99,7 @@ namespace OpenSim.Services.AssetService
99 99
100 public bool Get(string id, Object sender, AssetRetrieved handler) 100 public bool Get(string id, Object sender, AssetRetrieved handler)
101 { 101 {
102 //m_log.DebugFormat("[AssetService]: Got request for {0}", id); 102 //m_log.DebugFormat("[AssetService]: Get asset async {0}", id);
103 103
104 UUID assetID; 104 UUID assetID;
105 105
@@ -117,6 +117,7 @@ namespace OpenSim.Services.AssetService
117 117
118 public string Store(AssetBase asset) 118 public string Store(AssetBase asset)
119 { 119 {
120 //m_log.DebugFormat("[ASSET SERVICE]: Store asset {0} {1}", asset.Name, asset.ID);
120 m_Database.CreateAsset(asset); 121 m_Database.CreateAsset(asset);
121 122
122 return asset.ID; 123 return asset.ID;