diff options
author | Justin Clarke Casey | 2007-12-19 18:05:45 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-19 18:05:45 +0000 |
commit | 45567b71b8c3c6f2e52dacdda92671048bb3faf0 (patch) | |
tree | 97f6f09bfb255181cf1ae964f1ac09d61bc615c7 /OpenSim/Framework/Communications/Cache/AssetServer.cs | |
parent | Stopped module loader from re-loading .dll once for every plugin found within... (diff) | |
download | opensim-SC-45567b71b8c3c6f2e52dacdda92671048bb3faf0.zip opensim-SC-45567b71b8c3c6f2e52dacdda92671048bb3faf0.tar.gz opensim-SC-45567b71b8c3c6f2e52dacdda92671048bb3faf0.tar.bz2 opensim-SC-45567b71b8c3c6f2e52dacdda92671048bb3faf0.tar.xz |
Refactor asset request processing for consistent status information on whether an asset was actually found or not
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetServer.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetServer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs index 00c2b2a..4ad0f60 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | protected override void ProcessRequest(AssetRequest req) | 75 | protected override AssetBase _ProcessRequest(AssetRequest req) |
76 | { | 76 | { |
77 | byte[] idata = null; | 77 | byte[] idata = null; |
78 | bool found = false; | 78 | bool found = false; |
@@ -93,12 +93,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
93 | asset.Name = foundAsset.Name; | 93 | asset.Name = foundAsset.Name; |
94 | idata = foundAsset.Data; | 94 | idata = foundAsset.Data; |
95 | asset.Data = idata; | 95 | asset.Data = idata; |
96 | _receiver.AssetReceived(asset, req.IsTexture); | 96 | |
97 | return asset; | ||
97 | } | 98 | } |
98 | else | 99 | else |
99 | { | 100 | { |
100 | //asset.FullID = ; | 101 | return null; |
101 | _receiver.AssetNotFound(req.AssetID); | ||
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||