diff options
author | Mic Bowman | 2010-12-20 14:15:44 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-20 14:24:52 -0800 |
commit | a6a136bd90735b5a15ebc91c8a2a310f7250ac94 (patch) | |
tree | d0635436d356a26da75390eaf7f6b81142c71201 /OpenSim/Framework/Capabilities/Caps.cs | |
parent | Put the coarse location updates back to 50 frames, otherwise the dots on the ... (diff) | |
download | opensim-SC_OLD-a6a136bd90735b5a15ebc91c8a2a310f7250ac94.zip opensim-SC_OLD-a6a136bd90735b5a15ebc91c8a2a310f7250ac94.tar.gz opensim-SC_OLD-a6a136bd90735b5a15ebc91c8a2a310f7250ac94.tar.bz2 opensim-SC_OLD-a6a136bd90735b5a15ebc91c8a2a310f7250ac94.tar.xz |
Shooting in the dark for solutions to the appearance problem
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 63e1e34..dbb0781 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
@@ -1344,6 +1344,12 @@ 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 | handlerUpLoad = OnUpLoad; | ||
1348 | if (handlerUpLoad != null) | ||
1349 | { | ||
1350 | Util.FireAndForget(delegate(object o) { handlerUpLoad(newAssetID, data); }); | ||
1351 | } | ||
1352 | |||
1347 | string res = String.Empty; | 1353 | string res = String.Empty; |
1348 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); | 1354 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); |
1349 | uploadComplete.new_asset = newAssetID.ToString(); | 1355 | uploadComplete.new_asset = newAssetID.ToString(); |
@@ -1354,12 +1360,6 @@ namespace OpenSim.Framework.Capabilities | |||
1354 | 1360 | ||
1355 | httpListener.RemoveStreamHandler("POST", uploaderPath); | 1361 | httpListener.RemoveStreamHandler("POST", uploaderPath); |
1356 | 1362 | ||
1357 | handlerUpLoad = OnUpLoad; | ||
1358 | if (handlerUpLoad != null) | ||
1359 | { | ||
1360 | handlerUpLoad(newAssetID, data); | ||
1361 | } | ||
1362 | |||
1363 | m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); | 1363 | m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); |
1364 | 1364 | ||
1365 | return res; | 1365 | return res; |