Merge branch 'master' of /home/opensim/var/repo/opensim

1 files changed, 6 insertions, 12 deletions

diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index b89fd6a..b7ca703 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -73,12 +73,10 @@ namespace OpenSim.Capabilities.Handlers
         /// <param name="httpResponse"></param>
         /// <returns>The upload response if the request is successful, null otherwise.</returns>
         public string UploadBakedTexture(
-            string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+            string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             try
             {
-//                m_log.Debug("[CAPS]: UploadBakedTexture Request in region: " + m_regionName);
-
                 string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
                 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
 
@@ -106,7 +104,7 @@ namespace OpenSim.Capabilities.Handlers
             }
             catch (Exception e)
             {
-                m_log.Error("[UPLOAD BAKED TEXTURE HANDLER]: " + e.ToString());
+                m_log.Error("[CAPS]: " + e.ToString());
             }
 
             return null;
@@ -132,8 +130,6 @@ namespace OpenSim.Capabilities.Handlers
 
     class BakedTextureUploader
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         public event Action<UUID, byte[]> OnUpLoad;
 
         private string uploaderPath = String.Empty;
@@ -158,12 +154,10 @@ namespace OpenSim.Capabilities.Handlers
         public string uploaderCaps(byte[] data, string path, string param)
         {
             Action<UUID, byte[]> handlerUpLoad = OnUpLoad;
-
-            // Don't do this asynchronously, otherwise it's possible for the client to send set appearance information
-            // on another thread which might send out avatar updates before the asset has been put into the asset
-            // service.
             if (handlerUpLoad != null)
-                handlerUpLoad(newAssetID, data);
+            {
+                Util.FireAndForget(delegate(object o) { handlerUpLoad(newAssetID, data); });
+            }
 
             string res = String.Empty;
             LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
@@ -175,7 +169,7 @@ namespace OpenSim.Capabilities.Handlers
 
             httpListener.RemoveStreamHandler("POST", uploaderPath);
 
-//            m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID);
+            //                m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID);
 
             return res;
         }