Index: AssetManager.cs
===================================================================
--- AssetManager.cs	(revision 3312)
+++ AssetManager.cs	(working copy)
@@ -768,8 +768,10 @@
             request.AssetBlock.TransactionID = transactionID;
             request.AssetBlock.Type = (sbyte)type;
 
+			bool isMultiPacketUpload;
             if (data.Length + 100 < Settings.MAX_PACKET_SIZE)
             {
+				isMultiPacketUpload = false;
                 Logger.Log(
                     String.Format("Beginning asset upload [Single Packet], ID: {0}, AssetID: {1}, Size: {2}",
                     upload.ID.ToString(), upload.AssetID.ToString(), upload.Size), Helpers.LogLevel.Info, Client);
@@ -782,6 +784,7 @@
             }
             else
             {
+				isMultiPacketUpload = true;
                 Logger.Log(
                     String.Format("Beginning asset upload [Multiple Packets], ID: {0}, AssetID: {1}, Size: {2}",
                     upload.ID.ToString(), upload.AssetID.ToString(), upload.Size), Helpers.LogLevel.Info, Client);
@@ -804,7 +807,9 @@
 
                 if (t < UPLOAD_CONFIRM_TIMEOUT)
                 {
-                    WaitingForUploadConfirm = true;
+                    if (isMultiPacketUpload) {
+                        WaitingForUploadConfirm = true;
+                    }
                     PendingUpload = upload;
                     Client.Network.SendPacket(request);