2 files changed, 15 insertions, 7 deletions

diff --git a/OpenSim/Framework/IClientFileTransfer.cs b/OpenSim/Framework/IClientFileTransfer.cs
index d033a0d..832164e 100644
--- a/OpenSim/Framework/IClientFileTransfer.cs
+++ b/OpenSim/Framework/IClientFileTransfer.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -33,10 +33,11 @@ using OpenMetaverse;
 namespace OpenSim.Framework
 {
     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
     {
         bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback);
+        bool RequestUpload(UUID fileID, UploadComplete uploadCompleteCallback, UploadAborted abortCallback);
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
index b93c37c..9d7b39e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * 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)
         {
             uploader.UploadDone += uploadCompleteCallback;
+            uploader.UploadDone += RemoveXferHandler;
 
             if (abortCallback != null)
             {
@@ -113,6 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     // something went wrong with the xferID allocation
                     uploader.UploadDone -= uploadCompleteCallback;
+                    uploader.UploadDone -= RemoveXferHandler;
                     if (abortCallback != null)
                     {
                         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
@@ -186,7 +193,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_asset.FullID = fileID;
             m_asset.Type = type;
             m_asset.Data = new byte[0];
-            m_asset.Name = null;
+            m_asset.Name = String.Empty;
             m_asset.Description = "empty";
             m_asset.Local = true;
             m_asset.Temporary = true;
@@ -200,7 +207,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         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));
             }
@@ -259,8 +266,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handlerAbort = UploadAborted;
             if (handlerAbort != null)
             {
-                handlerAbort(m_asset.Name, mXferID, remoteClient);
+                handlerAbort(m_asset.Name, m_asset.FullID, mXferID, remoteClient);
             }
         }
     }
-}
+}
\ No newline at end of file