diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/GridAssetClient.cs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 47104d7..5801aa8 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
47 | 47 | ||
48 | #region IAssetServer Members | 48 | #region IAssetServer Members |
49 | 49 | ||
50 | protected override void ProcessRequest(AssetRequest req) | 50 | protected override AssetBase _ProcessRequest(AssetRequest req) |
51 | { | 51 | { |
52 | Stream s = null; | 52 | Stream s = null; |
53 | try | 53 | try |
@@ -66,14 +66,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
66 | if (s.Length > 0) | 66 | if (s.Length > 0) |
67 | { | 67 | { |
68 | XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); | 68 | XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); |
69 | AssetBase newAsset = (AssetBase)xs.Deserialize(s); | 69 | |
70 | 70 | return (AssetBase)xs.Deserialize(s); | |
71 | _receiver.AssetReceived(newAsset, req.IsTexture); | ||
72 | } | ||
73 | else | ||
74 | { | ||
75 | MainLog.Instance.Debug("ASSETCACHE", "Asset not found {0}", req.AssetID.ToString()); | ||
76 | _receiver.AssetNotFound(req.AssetID); | ||
77 | } | 71 | } |
78 | } | 72 | } |
79 | catch (Exception e) | 73 | catch (Exception e) |
@@ -82,6 +76,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
82 | MainLog.Instance.Debug("ASSETCACHE", "Getting asset {0}", req.AssetID.ToString()); | 76 | MainLog.Instance.Debug("ASSETCACHE", "Getting asset {0}", req.AssetID.ToString()); |
83 | MainLog.Instance.Error("ASSETCACHE", e.StackTrace); | 77 | MainLog.Instance.Error("ASSETCACHE", e.StackTrace); |
84 | } | 78 | } |
79 | |||
80 | return null; | ||
85 | } | 81 | } |
86 | 82 | ||
87 | 83 | ||