aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/GridInterfaces/Local
diff options
context:
space:
mode:
authorMW2007-08-26 17:57:25 +0000
committerMW2007-08-26 17:57:25 +0000
commit291eb48fb0338d80e3baeed65664d7a72fea1892 (patch)
tree8fa18a9474cb998a2e20fa9a124979b01bd41a8f /OpenSim/Region/GridInterfaces/Local
parentDanxors patch for >30prims with ODE (diff)
downloadopensim-SC_OLD-291eb48fb0338d80e3baeed65664d7a72fea1892.zip
opensim-SC_OLD-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.gz
opensim-SC_OLD-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.bz2
opensim-SC_OLD-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.xz
Another attempt to fix the image sending bug (next week, I intend to rewrite the assetcache and asset server).
Attempt to fix bug # 326. (crashing when using save-xml and hollow prims) Attempt to fix bug # 328 (limit of 50 items in a folder)
Diffstat (limited to 'OpenSim/Region/GridInterfaces/Local')
-rw-r--r--OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index a1cc10a..835212e 100644
--- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -144,13 +144,15 @@ namespace OpenSim.Region.GridInterfaces.Local
144 asset.InvType = foundAsset.Type; 144 asset.InvType = foundAsset.Type;
145 asset.Name = foundAsset.Name; 145 asset.Name = foundAsset.Name;
146 idata = foundAsset.Data; 146 idata = foundAsset.Data;
147 asset.Data = idata;
148 _receiver.AssetReceived(asset, req.IsTexture);
147 } 149 }
148 else 150 else
149 { 151 {
150 asset.FullID = LLUUID.Zero; 152 //asset.FullID = ;
153 _receiver.AssetNotFound(req.AssetID);
151 } 154 }
152 asset.Data = idata; 155
153 _receiver.AssetReceived(asset, req.IsTexture);
154 } 156 }
155 157
156 } 158 }