Index: AppearanceManager.cs
===================================================================
--- AppearanceManager.cs	(revision 2377)
+++ AppearanceManager.cs	(working copy)
@@ -1030,15 +1030,31 @@
         }
 
         private void UploadBake(Baker bake)
-        {
+        {
+            if(bake.BakedTexture.AssetID==UUID.Zero)
+            {
+                Logger.Log("UploadBake(): Warning possible Linden Default textures in use, skipping this baked upload",Helpers.LogLevel.Warning, Client);
+                return;
+            }
+
+            lock (PendingUploads)
+            {
+                if(PendingUploads.ContainsKey(bake.BakedTexture.AssetID))
+                {
+                    Logger.Log("UploadBake(): Skipping Asset id "+bake.BakedTexture.AssetID.ToString()+" Already in progress",Helpers.LogLevel.Info, Client);
+                    return;
+                }
+
+             // Add it to a pending uploads list
+             PendingUploads.Add(bake.BakedTexture.AssetID, BakeTypeToAgentTextureIndex(bake.BakeType));
+             }
+
             // Upload the completed layer data
             Assets.RequestUpload(bake.BakedTexture, true);
 
             Logger.DebugLog(String.Format("Bake {0} completed. Uploading asset {1}", bake.BakeType,
                 bake.BakedTexture.AssetID.ToString()), Client);
 
-            // Add it to a pending uploads list
-            lock (PendingUploads) PendingUploads.Add(bake.BakedTexture.AssetID, BakeTypeToAgentTextureIndex(bake.BakeType));
         }
 
         private int AddImageDownload(TextureIndex index)