aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 0eb144c..8f41d62 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -475,7 +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 private UpLoadedAsset handlerUpLoad = null;
479 479
480 private string uploaderPath = String.Empty; 480 private string uploaderPath = String.Empty;
481 private LLUUID newAssetID; 481 private LLUUID newAssetID;
@@ -529,10 +529,10 @@ namespace OpenSim.Region.Capabilities
529 { 529 {
530 SaveAssetToFile(m_assetName + ".jp2", data); 530 SaveAssetToFile(m_assetName + ".jp2", data);
531 } 531 }
532 handler001 = OnUpLoad; 532 handlerUpLoad = OnUpLoad;
533 if (handler001 != null) 533 if (handlerUpLoad != null)
534 { 534 {
535 handler001(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType); 535 handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);
536 } 536 }
537 537
538 return res; 538 return res;
@@ -569,7 +569,7 @@ namespace OpenSim.Region.Capabilities
569 { 569 {
570 public event UpdateItem OnUpLoad; 570 public event UpdateItem OnUpLoad;
571 571
572 private UpdateItem handler001 = null; 572 private UpdateItem handlerUpdateItem = null;
573 573
574 private string uploaderPath = String.Empty; 574 private string uploaderPath = String.Empty;
575 private LLUUID inventoryItemID; 575 private LLUUID inventoryItemID;
@@ -598,10 +598,10 @@ namespace OpenSim.Region.Capabilities
598 string res = String.Empty; 598 string res = String.Empty;
599 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 599 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
600 LLUUID assetID = LLUUID.Zero; 600 LLUUID assetID = LLUUID.Zero;
601 handler001 = OnUpLoad; 601 handlerUpdateItem = OnUpLoad;
602 if (handler001 != null) 602 if (handlerUpdateItem != null)
603 { 603 {
604 assetID = handler001(inv, data); 604 assetID = handlerUpdateItem(inv, data);
605 } 605 }
606 606
607 uploadComplete.new_asset = assetID.ToString(); 607 uploadComplete.new_asset = assetID.ToString();
@@ -651,7 +651,7 @@ namespace OpenSim.Region.Capabilities
651 { 651 {
652 public event UpdateTaskScript OnUpLoad; 652 public event UpdateTaskScript OnUpLoad;
653 653
654 private UpdateTaskScript handler001 = null; 654 private UpdateTaskScript handlerUpdateTaskScript = null;
655 655
656 private string uploaderPath = String.Empty; 656 private string uploaderPath = String.Empty;
657 private LLUUID inventoryItemID; 657 private LLUUID inventoryItemID;
@@ -693,10 +693,10 @@ namespace OpenSim.Region.Capabilities
693 string res = String.Empty; 693 string res = String.Empty;
694 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); 694 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
695 695
696 handler001 = OnUpLoad; 696 handlerUpdateTaskScript = OnUpLoad;
697 if (handler001 != null) 697 if (handlerUpdateTaskScript != null)
698 { 698 {
699 handler001(inventoryItemID, primID, isScriptRunning, data); 699 handlerUpdateTaskScript(inventoryItemID, primID, isScriptRunning, data);
700 } 700 }
701 701
702 uploadComplete.item_id = inventoryItemID; 702 uploadComplete.item_id = inventoryItemID;