aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs14
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index 97b558c..b89fd6a 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Capabilities.Handlers
106 } 106 }
107 catch (Exception e) 107 catch (Exception e)
108 { 108 {
109 m_log.Error("[CAPS]: " + e.ToString()); 109 m_log.Error("[UPLOAD BAKED TEXTURE HANDLER]: " + e.ToString());
110 } 110 }
111 111
112 return null; 112 return null;
@@ -132,6 +132,8 @@ namespace OpenSim.Capabilities.Handlers
132 132
133 class BakedTextureUploader 133 class BakedTextureUploader
134 { 134 {
135// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
136
135 public event Action<UUID, byte[]> OnUpLoad; 137 public event Action<UUID, byte[]> OnUpLoad;
136 138
137 private string uploaderPath = String.Empty; 139 private string uploaderPath = String.Empty;
@@ -156,10 +158,12 @@ namespace OpenSim.Capabilities.Handlers
156 public string uploaderCaps(byte[] data, string path, string param) 158 public string uploaderCaps(byte[] data, string path, string param)
157 { 159 {
158 Action<UUID, byte[]> handlerUpLoad = OnUpLoad; 160 Action<UUID, byte[]> handlerUpLoad = OnUpLoad;
161
162 // Don't do this asynchronously, otherwise it's possible for the client to send set appearance information
163 // on another thread which might send out avatar updates before the asset has been put into the asset
164 // service.
159 if (handlerUpLoad != null) 165 if (handlerUpLoad != null)
160 { 166 handlerUpLoad(newAssetID, data);
161 Util.FireAndForget(delegate(object o) { handlerUpLoad(newAssetID, data); });
162 }
163 167
164 string res = String.Empty; 168 string res = String.Empty;
165 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 169 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
@@ -171,7 +175,7 @@ namespace OpenSim.Capabilities.Handlers
171 175
172 httpListener.RemoveStreamHandler("POST", uploaderPath); 176 httpListener.RemoveStreamHandler("POST", uploaderPath);
173 177
174 // m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); 178// m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID);
175 179
176 return res; 180 return res;
177 } 181 }