diff options
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index a360dc3..0eb144c 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -475,6 +475,7 @@ namespace OpenSim.Region.Capabilities | |||
475 | public class AssetUploader | 475 | public class AssetUploader |
476 | { | 476 | { |
477 | public event UpLoadedAsset OnUpLoad; | 477 | public event UpLoadedAsset OnUpLoad; |
478 | private UpLoadedAsset handler001 = null; | ||
478 | 479 | ||
479 | private string uploaderPath = String.Empty; | 480 | private string uploaderPath = String.Empty; |
480 | private LLUUID newAssetID; | 481 | private LLUUID newAssetID; |
@@ -528,10 +529,10 @@ namespace OpenSim.Region.Capabilities | |||
528 | { | 529 | { |
529 | SaveAssetToFile(m_assetName + ".jp2", data); | 530 | SaveAssetToFile(m_assetName + ".jp2", data); |
530 | } | 531 | } |
531 | 532 | handler001 = OnUpLoad; | |
532 | if (OnUpLoad != null) | 533 | if (handler001 != null) |
533 | { | 534 | { |
534 | OnUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType); | 535 | handler001(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType); |
535 | } | 536 | } |
536 | 537 | ||
537 | return res; | 538 | return res; |
@@ -568,6 +569,8 @@ namespace OpenSim.Region.Capabilities | |||
568 | { | 569 | { |
569 | public event UpdateItem OnUpLoad; | 570 | public event UpdateItem OnUpLoad; |
570 | 571 | ||
572 | private UpdateItem handler001 = null; | ||
573 | |||
571 | private string uploaderPath = String.Empty; | 574 | private string uploaderPath = String.Empty; |
572 | private LLUUID inventoryItemID; | 575 | private LLUUID inventoryItemID; |
573 | private BaseHttpServer httpListener; | 576 | private BaseHttpServer httpListener; |
@@ -595,10 +598,10 @@ namespace OpenSim.Region.Capabilities | |||
595 | string res = String.Empty; | 598 | string res = String.Empty; |
596 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); | 599 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); |
597 | LLUUID assetID = LLUUID.Zero; | 600 | LLUUID assetID = LLUUID.Zero; |
598 | 601 | handler001 = OnUpLoad; | |
599 | if (OnUpLoad != null) | 602 | if (handler001 != null) |
600 | { | 603 | { |
601 | assetID = OnUpLoad(inv, data); | 604 | assetID = handler001(inv, data); |
602 | } | 605 | } |
603 | 606 | ||
604 | uploadComplete.new_asset = assetID.ToString(); | 607 | uploadComplete.new_asset = assetID.ToString(); |
@@ -648,6 +651,8 @@ namespace OpenSim.Region.Capabilities | |||
648 | { | 651 | { |
649 | public event UpdateTaskScript OnUpLoad; | 652 | public event UpdateTaskScript OnUpLoad; |
650 | 653 | ||
654 | private UpdateTaskScript handler001 = null; | ||
655 | |||
651 | private string uploaderPath = String.Empty; | 656 | private string uploaderPath = String.Empty; |
652 | private LLUUID inventoryItemID; | 657 | private LLUUID inventoryItemID; |
653 | private LLUUID primID; | 658 | private LLUUID primID; |
@@ -688,9 +693,10 @@ namespace OpenSim.Region.Capabilities | |||
688 | string res = String.Empty; | 693 | string res = String.Empty; |
689 | LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); | 694 | LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); |
690 | 695 | ||
691 | if (OnUpLoad != null) | 696 | handler001 = OnUpLoad; |
697 | if (handler001 != null) | ||
692 | { | 698 | { |
693 | OnUpLoad(inventoryItemID, primID, isScriptRunning, data); | 699 | handler001(inventoryItemID, primID, isScriptRunning, data); |
694 | } | 700 | } |
695 | 701 | ||
696 | uploadComplete.item_id = inventoryItemID; | 702 | uploadComplete.item_id = inventoryItemID; |