diff options
Diffstat (limited to 'OpenSim/Framework/Capabilities/Caps.cs')
-rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 5937ae6..dbb0781 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
@@ -1344,7 +1344,11 @@ namespace OpenSim.Framework.Capabilities | |||
1344 | /// <returns></returns> | 1344 | /// <returns></returns> |
1345 | public string uploaderCaps(byte[] data, string path, string param) | 1345 | public string uploaderCaps(byte[] data, string path, string param) |
1346 | { | 1346 | { |
1347 | m_log.WarnFormat("[CAPS] baked texture upload completed for {0}",newAssetID); | 1347 | handlerUpLoad = OnUpLoad; |
1348 | if (handlerUpLoad != null) | ||
1349 | { | ||
1350 | Util.FireAndForget(delegate(object o) { handlerUpLoad(newAssetID, data); }); | ||
1351 | } | ||
1348 | 1352 | ||
1349 | string res = String.Empty; | 1353 | string res = String.Empty; |
1350 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); | 1354 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); |
@@ -1356,12 +1360,6 @@ namespace OpenSim.Framework.Capabilities | |||
1356 | 1360 | ||
1357 | httpListener.RemoveStreamHandler("POST", uploaderPath); | 1361 | httpListener.RemoveStreamHandler("POST", uploaderPath); |
1358 | 1362 | ||
1359 | handlerUpLoad = OnUpLoad; | ||
1360 | if (handlerUpLoad != null) | ||
1361 | { | ||
1362 | handlerUpLoad(newAssetID, data); | ||
1363 | } | ||
1364 | |||
1365 | m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); | 1363 | m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); |
1366 | 1364 | ||
1367 | return res; | 1365 | return res; |