diff options
author | Adam Frisby | 2008-05-01 16:35:00 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 16:35:00 +0000 |
commit | 13526097f24b7a8ad63b1d482c44b44397fa055f (patch) | |
tree | 7a82c20ed7c63e2aea5ad3863325e37f64e1cbea /OpenSim/Region/Environment/Modules/Agent/AssetDownload | |
parent | * Breaking all the code, breaking all the code..! (diff) | |
download | opensim-SC-13526097f24b7a8ad63b1d482c44b44397fa055f.zip opensim-SC-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.gz opensim-SC-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.bz2 opensim-SC-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.xz |
* Spring cleaning on Region.Environment.
* Converted a large number of read-only fields to be actually, readonly.
* Reformatted code sections.
* Removed redundant code.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/AssetDownload')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index 48db51b..550b673 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | |||
@@ -40,15 +40,16 @@ 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 List<AssetRequest> AssetRequests; | 43 | private readonly List<AssetRequest> AssetRequests; |
44 | 44 | ||
45 | private Scene m_scene; | 45 | private readonly Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>(); |
46 | private Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>(); | ||
47 | 46 | ||
48 | /// | 47 | /// |
49 | /// Assets requests (for each user) which are waiting for asset server data. This includes texture requests | 48 | /// Assets requests (for each user) which are waiting for asset server data. This includes texture requests |
50 | /// </summary> | 49 | /// </summary> |
51 | private Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> RequestedAssets; | 50 | private readonly Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> RequestedAssets; |
51 | |||
52 | private Scene m_scene; | ||
52 | 53 | ||
53 | public AssetDownloadModule() | 54 | public AssetDownloadModule() |
54 | { | 55 | { |
@@ -205,22 +206,18 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
205 | { | 206 | { |
206 | public AssetBase AssetInf; | 207 | public AssetBase AssetInf; |
207 | public byte AssetRequestSource = 2; | 208 | public byte AssetRequestSource = 2; |
208 | public long DataPointer = 0; | 209 | public long DataPointer; |
209 | public int DiscardLevel = -1; | 210 | public int DiscardLevel = -1; |
210 | public AssetBase ImageInfo; | 211 | public AssetBase ImageInfo; |
211 | public bool IsTextureRequest; | 212 | public bool IsTextureRequest; |
212 | public int NumPackets = 0; | 213 | public int NumPackets; |
213 | public int PacketCounter = 0; | 214 | public int PacketCounter; |
214 | public byte[] Params = null; | 215 | public byte[] Params; |
215 | public LLUUID RequestAssetID; | 216 | public LLUUID RequestAssetID; |
216 | public IClientAPI RequestUser; | 217 | public IClientAPI RequestUser; |
217 | public LLUUID TransferRequestID; | 218 | public LLUUID TransferRequestID; |
218 | //public bool AssetInCache; | 219 | //public bool AssetInCache; |
219 | //public int TimeRequested; | 220 | //public int TimeRequested; |
220 | |||
221 | public AssetRequest() | ||
222 | { | ||
223 | } | ||
224 | } | 221 | } |
225 | 222 | ||
226 | #endregion | 223 | #endregion |