OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more work on moving FileTransfer code to the clientstack. 

Still not enabled.
0.6.1-post-fixes
MW 2008-12-13 15:04:24 +00:00
parent 8929bfc369
commit 40bbf886f2
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/IClientFileTransfer.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -33,10 +33,11 @@ using OpenMetaverse;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public delegate void UploadComplete(string filename, UUID fileID, byte[] fileData, IClientAPI remoteClient); public delegate void UploadComplete(string filename, UUID fileID, byte[] fileData, IClientAPI remoteClient);
public delegate void UploadAborted(string filename, ulong id, IClientAPI remoteClient); public delegate void UploadAborted(string filename, UUID fileID, ulong transferID, IClientAPI remoteClient);
public interface IClientFileTransfer public interface IClientFileTransfer
{ {
bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback); bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback);
bool RequestUpload(UUID fileID, UploadComplete uploadCompleteCallback, UploadAborted abortCallback);
} }
} }

15
OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -95,6 +95,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private bool StartUpload(XferHandler uploader, UploadComplete uploadCompleteCallback, UploadAborted abortCallback) private bool StartUpload(XferHandler uploader, UploadComplete uploadCompleteCallback, UploadAborted abortCallback)
{ {
uploader.UploadDone += uploadCompleteCallback; uploader.UploadDone += uploadCompleteCallback;
uploader.UploadDone += RemoveXferHandler;
if (abortCallback != null) if (abortCallback != null)
{ {
@ -113,6 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
// something went wrong with the xferID allocation // something went wrong with the xferID allocation
uploader.UploadDone -= uploadCompleteCallback; uploader.UploadDone -= uploadCompleteCallback;
uploader.UploadDone -= RemoveXferHandler;
if (abortCallback != null) if (abortCallback != null)
{ {
uploader.UploadAborted -= abortCallback; uploader.UploadAborted -= abortCallback;
@ -144,6 +146,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
} }
protected void RemoveXferHandler(string filename, UUID fileID, byte[] fileData, IClientAPI remoteClient)
{
}
} }
public class XferHandler public class XferHandler
@ -186,7 +193,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_asset.FullID = fileID; m_asset.FullID = fileID;
m_asset.Type = type; m_asset.Type = type;
m_asset.Data = new byte[0]; m_asset.Data = new byte[0];
m_asset.Name = null; m_asset.Name = String.Empty;
m_asset.Description = "empty"; m_asset.Description = "empty";
m_asset.Local = true; m_asset.Local = true;
m_asset.Temporary = true; m_asset.Temporary = true;
@ -200,7 +207,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void RequestStartXfer(IClientAPI pRemoteClient) public void RequestStartXfer(IClientAPI pRemoteClient)
{ {
if (m_asset.Name != null) if (!String.IsNullOrEmpty(m_asset.Name) )
{ {
pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name)); pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name));
} }
@ -259,7 +266,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerAbort = UploadAborted; handlerAbort = UploadAborted;
if (handlerAbort != null) if (handlerAbort != null)
{ {
handlerAbort(m_asset.Name, mXferID, remoteClient); handlerAbort(m_asset.Name, m_asset.FullID, mXferID, remoteClient);
} }
} }
} }