diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/Modules/Agent/AssetDownload | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/AssetDownload')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index 550b673..48db51b 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | |||
@@ -40,16 +40,15 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
40 | /// <summary> | 40 | /// <summary> |
41 | /// Asset requests with data which are ready to be sent back to requesters. This includes textures. | 41 | /// Asset requests with data which are ready to be sent back to requesters. This includes textures. |
42 | /// </summary> | 42 | /// </summary> |
43 | private readonly List<AssetRequest> AssetRequests; | 43 | private List<AssetRequest> AssetRequests; |
44 | 44 | ||
45 | private readonly Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>(); | 45 | private Scene m_scene; |
46 | private Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>(); | ||
46 | 47 | ||
47 | /// | 48 | /// |
48 | /// Assets requests (for each user) which are waiting for asset server data. This includes texture requests | 49 | /// Assets requests (for each user) which are waiting for asset server data. This includes texture requests |
49 | /// </summary> | 50 | /// </summary> |
50 | private readonly Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> RequestedAssets; | 51 | private Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> RequestedAssets; |
51 | |||
52 | private Scene m_scene; | ||
53 | 52 | ||
54 | public AssetDownloadModule() | 53 | public AssetDownloadModule() |
55 | { | 54 | { |
@@ -206,18 +205,22 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
206 | { | 205 | { |
207 | public AssetBase AssetInf; | 206 | public AssetBase AssetInf; |
208 | public byte AssetRequestSource = 2; | 207 | public byte AssetRequestSource = 2; |
209 | public long DataPointer; | 208 | public long DataPointer = 0; |
210 | public int DiscardLevel = -1; | 209 | public int DiscardLevel = -1; |
211 | public AssetBase ImageInfo; | 210 | public AssetBase ImageInfo; |
212 | public bool IsTextureRequest; | 211 | public bool IsTextureRequest; |
213 | public int NumPackets; | 212 | public int NumPackets = 0; |
214 | public int PacketCounter; | 213 | public int PacketCounter = 0; |
215 | public byte[] Params; | 214 | public byte[] Params = null; |
216 | public LLUUID RequestAssetID; | 215 | public LLUUID RequestAssetID; |
217 | public IClientAPI RequestUser; | 216 | public IClientAPI RequestUser; |
218 | public LLUUID TransferRequestID; | 217 | public LLUUID TransferRequestID; |
219 | //public bool AssetInCache; | 218 | //public bool AssetInCache; |
220 | //public int TimeRequested; | 219 | //public int TimeRequested; |
220 | |||
221 | public AssetRequest() | ||
222 | { | ||
223 | } | ||
221 | } | 224 | } |
222 | 225 | ||
223 | #endregion | 226 | #endregion |