From 20a9bf08f51351e1e0a9de94f184ff56cd572665 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 1 May 2008 18:04:42 +0000
Subject: * Rolled back a few changes.
---
.../Agent/AssetDownload/AssetDownloadModule.cs | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/Agent/AssetDownload')
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
///
/// Asset requests with data which are ready to be sent back to requesters. This includes textures.
///
- private readonly List AssetRequests;
+ private List AssetRequests;
- private readonly Dictionary RegisteredScenes = new Dictionary();
+ private Scene m_scene;
+ private Dictionary RegisteredScenes = new Dictionary();
///
/// Assets requests (for each user) which are waiting for asset server data. This includes texture requests
///
- private readonly Dictionary> RequestedAssets;
-
- private Scene m_scene;
+ private Dictionary> RequestedAssets;
public AssetDownloadModule()
{
@@ -206,18 +205,22 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload
{
public AssetBase AssetInf;
public byte AssetRequestSource = 2;
- public long DataPointer;
+ public long DataPointer = 0;
public int DiscardLevel = -1;
public AssetBase ImageInfo;
public bool IsTextureRequest;
- public int NumPackets;
- public int PacketCounter;
- public byte[] Params;
+ public int NumPackets = 0;
+ public int PacketCounter = 0;
+ public byte[] Params = null;
public LLUUID RequestAssetID;
public IClientAPI RequestUser;
public LLUUID TransferRequestID;
//public bool AssetInCache;
//public int TimeRequested;
+
+ public AssetRequest()
+ {
+ }
}
#endregion
--
cgit v1.1