diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs index 517de34..d2d86b9 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
42 | { | 42 | { |
43 | /// <summary> | 43 | /// <summary> |
44 | /// A work in progress, to contain the SL specific file transfer code that is currently in various region modules | 44 | /// A work in progress, to contain the SL specific file transfer code that is currently in various region modules |
45 | /// This file currently contains multiple classes that need to be split out into their own files. | 45 | /// This file currently contains multiple classes that need to be split out into their own files. |
46 | /// </summary> | 46 | /// </summary> |
47 | public class LLFileTransfer : IClientFileTransfer | 47 | public class LLFileTransfer : IClientFileTransfer |
48 | { | 48 | { |
@@ -206,13 +206,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
206 | private void Initialise(UUID fileID, string fileName) | 206 | private void Initialise(UUID fileID, string fileName) |
207 | { | 207 | { |
208 | m_asset = new AssetBase(); | 208 | m_asset = new AssetBase(); |
209 | m_asset.FullID = fileID; | 209 | m_asset.Metadata.FullID = fileID; |
210 | m_asset.Type = type; | 210 | m_asset.Metadata.Type = type; |
211 | m_asset.Data = new byte[0]; | 211 | m_asset.Data = new byte[0]; |
212 | m_asset.Name = fileName; | 212 | m_asset.Metadata.Name = fileName; |
213 | m_asset.Description = "empty"; | 213 | m_asset.Metadata.Description = "empty"; |
214 | m_asset.Local = true; | 214 | m_asset.Metadata.Local = true; |
215 | m_asset.Temporary = true; | 215 | m_asset.Metadata.Temporary = true; |
216 | mXferID = Util.GetNextXferID(); | 216 | mXferID = Util.GetNextXferID(); |
217 | } | 217 | } |
218 | 218 | ||
@@ -223,13 +223,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
223 | 223 | ||
224 | public void RequestStartXfer(IClientAPI pRemoteClient) | 224 | public void RequestStartXfer(IClientAPI pRemoteClient) |
225 | { | 225 | { |
226 | if (!String.IsNullOrEmpty(m_asset.Name)) | 226 | if (!String.IsNullOrEmpty(m_asset.Metadata.Name)) |
227 | { | 227 | { |
228 | pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name)); | 228 | pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, Utils.StringToBytes(m_asset.Metadata.Name)); |
229 | } | 229 | } |
230 | else | 230 | else |
231 | { | 231 | { |
232 | pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, new byte[0]); | 232 | pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, new byte[0]); |
233 | } | 233 | } |
234 | } | 234 | } |
235 | 235 | ||
@@ -238,7 +238,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
238 | /// </summary> | 238 | /// </summary> |
239 | /// <param name="xferID"></param> | 239 | /// <param name="xferID"></param> |
240 | /// <param name="packetID"></param> | 240 | /// <param name="packetID"></param> |
241 | /// <param name="data"></param> | 241 | /// <param name="data"></param> |
242 | public void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) | 242 | public void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) |
243 | { | 243 | { |
244 | if (mXferID == xferID) | 244 | if (mXferID == xferID) |
@@ -273,7 +273,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
273 | handlerUploadDone = UploadDone; | 273 | handlerUploadDone = UploadDone; |
274 | if (handlerUploadDone != null) | 274 | if (handlerUploadDone != null) |
275 | { | 275 | { |
276 | handlerUploadDone(m_asset.Name, m_asset.FullID, mXferID, m_asset.Data, remoteClient); | 276 | handlerUploadDone(m_asset.Metadata.Name, m_asset.Metadata.FullID, mXferID, m_asset.Data, remoteClient); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | 279 | ||
@@ -282,7 +282,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
282 | handlerAbort = UploadAborted; | 282 | handlerAbort = UploadAborted; |
283 | if (handlerAbort != null) | 283 | if (handlerAbort != null) |
284 | { | 284 | { |
285 | handlerAbort(m_asset.Name, m_asset.FullID, mXferID, remoteClient); | 285 | handlerAbort(m_asset.Metadata.Name, m_asset.Metadata.FullID, mXferID, remoteClient); |
286 | } | 286 | } |
287 | } | 287 | } |
288 | } | 288 | } |
@@ -373,4 +373,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
373 | } | 373 | } |
374 | } | 374 | } |
375 | 375 | ||
376 | } \ No newline at end of file | 376 | } |