OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously."" 

This turned out not to be the upload texture issue.

This reverts commit 8721841fc3.
iar_mods
Justin Clark-Casey (justincc) 2011-12-08 23:45:53 +00:00
parent 50eebb5cba
commit 63fe673af1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
View File

@ -104,7 +104,7 @@ namespace OpenSim.Capabilities.Handlers
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[CAPS]: " + e.ToString()); m_log.Error("[UPLOAD BAKED TEXTURE HANDLER]: " + e.ToString());
} }
return null; return null;
@ -130,6 +130,8 @@ namespace OpenSim.Capabilities.Handlers
class BakedTextureUploader class BakedTextureUploader
{ {
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public event Action<UUID, byte[]> OnUpLoad; public event Action<UUID, byte[]> OnUpLoad;
private string uploaderPath = String.Empty; private string uploaderPath = String.Empty;
@ -154,10 +156,12 @@ namespace OpenSim.Capabilities.Handlers
public string uploaderCaps(byte[] data, string path, string param) public string uploaderCaps(byte[] data, string path, string param)
{ {
Action<UUID, byte[]> handlerUpLoad = OnUpLoad; 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) if (handlerUpLoad != null)
{ handlerUpLoad(newAssetID, data);
Util.FireAndForget(delegate(object o) { handlerUpLoad(newAssetID, data); });
}
string res = String.Empty; string res = String.Empty;
LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
@ -169,7 +173,7 @@ namespace OpenSim.Capabilities.Handlers
httpListener.RemoveStreamHandler("POST", uploaderPath); httpListener.RemoveStreamHandler("POST", uploaderPath);
// m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); // m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID);
return res; return res;
} }