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

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

This prevents a possible race condition where the client would be told all baked textures had updated before they were in the asset service.
The client would then trigger a set appearance which, after a delay, would send the avatar appearance out to other clients.
The race condition seems unlikely because of this delay but it's still possible.
Might help with grey avatar appearances.
iar_mods
Justin Clark-Casey (justincc) 2011-12-01 23:38:25 +00:00
parent 5460f2e035
commit 1854c52ea3
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

@ -106,7 +106,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;
@ -132,6 +132,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;
@ -156,10 +158,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();
@ -171,7 +175,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;
} }