diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index d3cf41e..3b521c3 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | |||
@@ -26,8 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using libsecondlife; | 29 | using OpenMetaverse; |
30 | using libsecondlife.Packets; | 30 | using OpenMetaverse.Packets; |
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Interfaces; | 33 | using OpenSim.Region.Environment.Interfaces; |
@@ -43,16 +43,16 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
43 | private List<AssetRequest> AssetRequests; | 43 | private List<AssetRequest> AssetRequests; |
44 | 44 | ||
45 | private Scene m_scene; | 45 | private Scene m_scene; |
46 | private Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>(); | 46 | private Dictionary<UUID, Scene> RegisteredScenes = new Dictionary<UUID, Scene>(); |
47 | 47 | ||
48 | /// | 48 | /// |
49 | /// 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 |
50 | /// </summary> | 50 | /// </summary> |
51 | private Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>> RequestedAssets; | 51 | private Dictionary<UUID, Dictionary<UUID, AssetRequest>> RequestedAssets; |
52 | 52 | ||
53 | public AssetDownloadModule() | 53 | public AssetDownloadModule() |
54 | { | 54 | { |
55 | RequestedAssets = new Dictionary<LLUUID, Dictionary<LLUUID, AssetRequest>>(); | 55 | RequestedAssets = new Dictionary<UUID, Dictionary<UUID, AssetRequest>>(); |
56 | AssetRequests = new List<AssetRequest>(); | 56 | AssetRequests = new List<AssetRequest>(); |
57 | } | 57 | } |
58 | 58 | ||
@@ -109,24 +109,24 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
109 | /// <param name="transferRequest"></param> | 109 | /// <param name="transferRequest"></param> |
110 | public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest) | 110 | public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest) |
111 | { | 111 | { |
112 | LLUUID requestID = null; | 112 | UUID requestID = null; |
113 | byte source = 2; | 113 | byte source = 2; |
114 | if (transferRequest.TransferInfo.SourceType == 2) | 114 | if (transferRequest.TransferInfo.SourceType == 2) |
115 | { | 115 | { |
116 | //direct asset request | 116 | //direct asset request |
117 | requestID = new LLUUID(transferRequest.TransferInfo.Params, 0); | 117 | requestID = new UUID(transferRequest.TransferInfo.Params, 0); |
118 | } | 118 | } |
119 | else if (transferRequest.TransferInfo.SourceType == 3) | 119 | else if (transferRequest.TransferInfo.SourceType == 3) |
120 | { | 120 | { |
121 | //inventory asset request | 121 | //inventory asset request |
122 | requestID = new LLUUID(transferRequest.TransferInfo.Params, 80); | 122 | requestID = new UUID(transferRequest.TransferInfo.Params, 80); |
123 | source = 3; | 123 | source = 3; |
124 | //Console.WriteLine("asset request " + requestID); | 124 | //Console.WriteLine("asset request " + requestID); |
125 | } | 125 | } |
126 | 126 | ||
127 | //not found asset | 127 | //not found asset |
128 | // so request from asset server | 128 | // so request from asset server |
129 | Dictionary<LLUUID, AssetRequest> userRequests = null; | 129 | Dictionary<UUID, AssetRequest> userRequests = null; |
130 | if (RequestedAssets.TryGetValue(userInfo.AgentId, out userRequests)) | 130 | if (RequestedAssets.TryGetValue(userInfo.AgentId, out userRequests)) |
131 | { | 131 | { |
132 | if (!userRequests.ContainsKey(requestID)) | 132 | if (!userRequests.ContainsKey(requestID)) |
@@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
143 | } | 143 | } |
144 | else | 144 | else |
145 | { | 145 | { |
146 | userRequests = new Dictionary<LLUUID, AssetRequest>(); | 146 | userRequests = new Dictionary<UUID, AssetRequest>(); |
147 | AssetRequest request = new AssetRequest(); | 147 | AssetRequest request = new AssetRequest(); |
148 | request.RequestUser = userInfo; | 148 | request.RequestUser = userInfo; |
149 | request.RequestAssetID = requestID; | 149 | request.RequestAssetID = requestID; |
@@ -156,11 +156,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
159 | public void AssetCallback(LLUUID assetID, AssetBase asset) | 159 | public void AssetCallback(UUID assetID, AssetBase asset) |
160 | { | 160 | { |
161 | if (asset != null) | 161 | if (asset != null) |
162 | { | 162 | { |
163 | foreach (Dictionary<LLUUID, AssetRequest> userRequests in RequestedAssets.Values) | 163 | foreach (Dictionary<UUID, AssetRequest> userRequests in RequestedAssets.Values) |
164 | { | 164 | { |
165 | if (userRequests.ContainsKey(assetID)) | 165 | if (userRequests.ContainsKey(assetID)) |
166 | { | 166 | { |
@@ -212,9 +212,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
212 | public int NumPackets = 0; | 212 | public int NumPackets = 0; |
213 | public int PacketCounter = 0; | 213 | public int PacketCounter = 0; |
214 | public byte[] Params = null; | 214 | public byte[] Params = null; |
215 | public LLUUID RequestAssetID; | 215 | public UUID RequestAssetID; |
216 | public IClientAPI RequestUser; | 216 | public IClientAPI RequestUser; |
217 | public LLUUID TransferRequestID; | 217 | public UUID TransferRequestID; |
218 | //public bool AssetInCache; | 218 | //public bool AssetInCache; |
219 | //public int TimeRequested; | 219 | //public int TimeRequested; |
220 | 220 | ||
@@ -225,4 +225,4 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
225 | 225 | ||
226 | #endregion | 226 | #endregion |
227 | } | 227 | } |
228 | } \ No newline at end of file | 228 | } |