aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-15 20:20:55 +0000
committerJustin Clarke Casey2009-05-15 20:20:55 +0000
commitc11e047410fdabb5c53ebdb7cec637a177254aeb (patch)
treea59b59b3840090dc7ab4d774fd2acae8a65f3dab /OpenSim/Services/AssetService
parent* Change default sqlite asset db back to Asset.db instead of AssetStorage.db (diff)
downloadopensim-SC_OLD-c11e047410fdabb5c53ebdb7cec637a177254aeb.zip
opensim-SC_OLD-c11e047410fdabb5c53ebdb7cec637a177254aeb.tar.gz
opensim-SC_OLD-c11e047410fdabb5c53ebdb7cec637a177254aeb.tar.bz2
opensim-SC_OLD-c11e047410fdabb5c53ebdb7cec637a177254aeb.tar.xz
* Resolve bug where save oar would never complete if any assets were missing
Diffstat (limited to 'OpenSim/Services/AssetService')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index bc6d752..af3a746 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -98,6 +98,8 @@ namespace OpenSim.Services.AssetService
98 98
99 public bool Get(string id, Object sender, AssetRetrieved handler) 99 public bool Get(string id, Object sender, AssetRetrieved handler)
100 { 100 {
101 //m_log.DebugFormat("[AssetService]: Got request for {0}", id);
102
101 UUID assetID; 103 UUID assetID;
102 104
103 if (!UUID.TryParse(id, out assetID)) 105 if (!UUID.TryParse(id, out assetID))
@@ -105,6 +107,8 @@ namespace OpenSim.Services.AssetService
105 107
106 AssetBase asset = m_Database.FetchAsset(assetID); 108 AssetBase asset = m_Database.FetchAsset(assetID);
107 109
110 //m_log.DebugFormat("[AssetService]: Got asset {0}", asset);
111
108 handler(id, sender, asset); 112 handler(id, sender, asset);
109 113
110 return true; 114 return true;