aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2009-05-28 15:05:00 +0000
committerdiva2009-05-28 15:05:00 +0000
commit275e53b126970c644d95f1fef71dc8112ed15dd4 (patch)
tree982c64c2904aca51a80e37b47f8a32d2f47ff507 /OpenSim
parent* So, giving up on my efforts to de-duplicate the asset handlers. I'll just s... (diff)
downloadopensim-SC_OLD-275e53b126970c644d95f1fef71dc8112ed15dd4.zip
opensim-SC_OLD-275e53b126970c644d95f1fef71dc8112ed15dd4.tar.gz
opensim-SC_OLD-275e53b126970c644d95f1fef71dc8112ed15dd4.tar.bz2
opensim-SC_OLD-275e53b126970c644d95f1fef71dc8112ed15dd4.tar.xz
This may bring the missing texture back.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index a88fd26..947931e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -134,8 +134,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
134 134
135 protected void AssetReceived(string id, Object sender, AssetBase asset) 135 protected void AssetReceived(string id, Object sender, AssetBase asset)
136 { 136 {
137 UUID assetID = UUID.Zero;
137 if (asset != null) 138 if (asset != null)
138 AssetDataCallback(asset.FullID, asset); 139 assetID = asset.FullID;
140
141 AssetDataCallback(assetID, asset);
142
139 } 143 }
140 144
141 private int GetPacketForBytePosition(int bytePosition) 145 private int GetPacketForBytePosition(int bytePosition)