aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-06 18:37:13 +0000
committerJustin Clark-Casey (justincc)2011-12-06 18:37:13 +0000
commit8721841fc3944ce0cdf5ce76297e73f9ed269751 (patch)
tree8d3bbadb1527bcea143e8d290968406e84114e17 /OpenSim
parentMake "show appearance" a synonym for "appearance show" (diff)
downloadopensim-SC_OLD-8721841fc3944ce0cdf5ce76297e73f9ed269751.zip
opensim-SC_OLD-8721841fc3944ce0cdf5ce76297e73f9ed269751.tar.gz
opensim-SC_OLD-8721841fc3944ce0cdf5ce76297e73f9ed269751.tar.bz2
opensim-SC_OLD-8721841fc3944ce0cdf5ce76297e73f9ed269751.tar.xz
Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously."
This is a possible cause of the dramatic upswing in "Unable to upload... No handler registered for LLSD requests..." Needs more investigation. This reverts commit 1854c52ea3c60d0a47f9793a7f5ec405e15489ca.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs14
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index e0ccc3c..e3bf8cf 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("[UPLOAD BAKED TEXTURE HANDLER]: " + e.ToString()); 109 m_log.Error("[CAPS]: " + e.ToString());
110 } 110 }
111 111
112 return null; 112 return null;
@@ -132,8 +132,6 @@ 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
137 public event Action<UUID, byte[]> OnUpLoad; 135 public event Action<UUID, byte[]> OnUpLoad;
138 136
139 private string uploaderPath = String.Empty; 137 private string uploaderPath = String.Empty;
@@ -158,12 +156,10 @@ namespace OpenSim.Capabilities.Handlers
158 public string uploaderCaps(byte[] data, string path, string param) 156 public string uploaderCaps(byte[] data, string path, string param)
159 { 157 {
160 Action<UUID, byte[]> handlerUpLoad = OnUpLoad; 158 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.
165 if (handlerUpLoad != null) 159 if (handlerUpLoad != null)
166 handlerUpLoad(newAssetID, data); 160 {
161 Util.FireAndForget(delegate(object o) { handlerUpLoad(newAssetID, data); });
162 }
167 163
168 string res = String.Empty; 164 string res = String.Empty;
169 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 165 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
@@ -175,7 +171,7 @@ namespace OpenSim.Capabilities.Handlers
175 171
176 httpListener.RemoveStreamHandler("POST", uploaderPath); 172 httpListener.RemoveStreamHandler("POST", uploaderPath);
177 173
178// m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID); 174 // m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID);
179 175
180 return res; 176 return res;
181 } 177 }