aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMW2007-12-10 13:27:23 +0000
committerMW2007-12-10 13:27:23 +0000
commit611327e1040fa706665c543f67f9331a7e0136c5 (patch)
tree4426a50291dbc1c7c4ec065fd5c48921a767b658 /OpenSim/Region/ClientStack
parentadded musings on llInstantMessage (diff)
downloadopensim-SC_OLD-611327e1040fa706665c543f67f9331a7e0136c5.zip
opensim-SC_OLD-611327e1040fa706665c543f67f9331a7e0136c5.tar.gz
opensim-SC_OLD-611327e1040fa706665c543f67f9331a7e0136c5.tar.bz2
opensim-SC_OLD-611327e1040fa706665c543f67f9331a7e0136c5.tar.xz
more work on texture downloading.
Refractored the TextureDownloadModule (but currently to make debugging easier, it is running as a non shared module, so this results in a instance of this module being created for each region (and a extra thread per region), this will be changed back soon. Removed the old texture handling/sending code from AssetCache. A few other small changes/fixes.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 31f01fc..1a544b8 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2738,6 +2738,7 @@ namespace OpenSim.Region.ClientStack
2738 args.RequestedAssetID = imageRequest.RequestImage[i].Image; 2738 args.RequestedAssetID = imageRequest.RequestImage[i].Image;
2739 args.DiscardLevel = imageRequest.RequestImage[i].DiscardLevel; 2739 args.DiscardLevel = imageRequest.RequestImage[i].DiscardLevel;
2740 args.PacketNumber = imageRequest.RequestImage[i].Packet; 2740 args.PacketNumber = imageRequest.RequestImage[i].Packet;
2741 args.Priority = imageRequest.RequestImage[i].DownloadPriority;
2741 2742
2742 OnRequestTexture(this, args); 2743 OnRequestTexture(this, args);
2743 } 2744 }
@@ -2761,7 +2762,7 @@ namespace OpenSim.Region.ClientStack
2761 LLUUID temp=libsecondlife.LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); 2762 LLUUID temp=libsecondlife.LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
2762 OnAssetUploadRequest(this, temp, 2763 OnAssetUploadRequest(this, temp,
2763 request.AssetBlock.TransactionID, request.AssetBlock.Type, 2764 request.AssetBlock.TransactionID, request.AssetBlock.Type,
2764 request.AssetBlock.AssetData, request.AssetBlock.StoreLocal); 2765 request.AssetBlock.AssetData, request.AssetBlock.StoreLocal, request.AssetBlock.Tempfile);
2765 } 2766 }
2766 break; 2767 break;
2767 case PacketType.RequestXfer: 2768 case PacketType.RequestXfer: