diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities/Caps.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 74d8125..f85b4ab 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -197,7 +197,7 @@ namespace OpenSim.Region.Capabilities | |||
197 | { | 197 | { |
198 | Console.WriteLine("texture request " + request); | 198 | Console.WriteLine("texture request " + request); |
199 | // Needs implementing (added to remove compiler warning) | 199 | // Needs implementing (added to remove compiler warning) |
200 | return ""; | 200 | return String.Empty; |
201 | } | 201 | } |
202 | 202 | ||
203 | #region EventQueue (Currently not enabled) | 203 | #region EventQueue (Currently not enabled) |
@@ -211,7 +211,7 @@ namespace OpenSim.Region.Capabilities | |||
211 | /// <returns></returns> | 211 | /// <returns></returns> |
212 | public string ProcessEventQueue(string request, string path, string param) | 212 | public string ProcessEventQueue(string request, string path, string param) |
213 | { | 213 | { |
214 | string res = ""; | 214 | string res = String.Empty; |
215 | 215 | ||
216 | if (m_capsEventQueue.Count > 0) | 216 | if (m_capsEventQueue.Count > 0) |
217 | { | 217 | { |
@@ -476,17 +476,17 @@ namespace OpenSim.Region.Capabilities | |||
476 | { | 476 | { |
477 | public event UpLoadedAsset OnUpLoad; | 477 | public event UpLoadedAsset OnUpLoad; |
478 | 478 | ||
479 | private string uploaderPath = ""; | 479 | private string uploaderPath = String.Empty; |
480 | private LLUUID newAssetID; | 480 | private LLUUID newAssetID; |
481 | private LLUUID inventoryItemID; | 481 | private LLUUID inventoryItemID; |
482 | private LLUUID parentFolder; | 482 | private LLUUID parentFolder; |
483 | private BaseHttpServer httpListener; | 483 | private BaseHttpServer httpListener; |
484 | private bool m_dumpAssetsToFile; | 484 | private bool m_dumpAssetsToFile; |
485 | private string m_assetName = ""; | 485 | private string m_assetName = String.Empty; |
486 | private string m_assetDes = ""; | 486 | private string m_assetDes = String.Empty; |
487 | 487 | ||
488 | private string m_invType = ""; | 488 | private string m_invType = String.Empty; |
489 | private string m_assetType = ""; | 489 | private string m_assetType = String.Empty; |
490 | 490 | ||
491 | public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, | 491 | public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem, |
492 | LLUUID parentFolderID, string invType, string assetType, string path, | 492 | LLUUID parentFolderID, string invType, string assetType, string path, |
@@ -514,7 +514,7 @@ namespace OpenSim.Region.Capabilities | |||
514 | public string uploaderCaps(byte[] data, string path, string param) | 514 | public string uploaderCaps(byte[] data, string path, string param) |
515 | { | 515 | { |
516 | LLUUID inv = inventoryItemID; | 516 | LLUUID inv = inventoryItemID; |
517 | string res = ""; | 517 | string res = String.Empty; |
518 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); | 518 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); |
519 | uploadComplete.new_asset = newAssetID.ToString(); | 519 | uploadComplete.new_asset = newAssetID.ToString(); |
520 | uploadComplete.new_inventory_item = inv; | 520 | uploadComplete.new_inventory_item = inv; |
@@ -568,7 +568,7 @@ namespace OpenSim.Region.Capabilities | |||
568 | { | 568 | { |
569 | public event UpdateItem OnUpLoad; | 569 | public event UpdateItem OnUpLoad; |
570 | 570 | ||
571 | private string uploaderPath = ""; | 571 | private string uploaderPath = String.Empty; |
572 | private LLUUID inventoryItemID; | 572 | private LLUUID inventoryItemID; |
573 | private BaseHttpServer httpListener; | 573 | private BaseHttpServer httpListener; |
574 | private bool m_dumpAssetToFile; | 574 | private bool m_dumpAssetToFile; |
@@ -592,7 +592,7 @@ namespace OpenSim.Region.Capabilities | |||
592 | public string uploaderCaps(byte[] data, string path, string param) | 592 | public string uploaderCaps(byte[] data, string path, string param) |
593 | { | 593 | { |
594 | LLUUID inv = inventoryItemID; | 594 | LLUUID inv = inventoryItemID; |
595 | string res = ""; | 595 | string res = String.Empty; |
596 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); | 596 | LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); |
597 | LLUUID assetID = LLUUID.Zero; | 597 | LLUUID assetID = LLUUID.Zero; |
598 | 598 | ||
@@ -648,7 +648,7 @@ namespace OpenSim.Region.Capabilities | |||
648 | { | 648 | { |
649 | public event UpdateTaskScript OnUpLoad; | 649 | public event UpdateTaskScript OnUpLoad; |
650 | 650 | ||
651 | private string uploaderPath = ""; | 651 | private string uploaderPath = String.Empty; |
652 | private LLUUID inventoryItemID; | 652 | private LLUUID inventoryItemID; |
653 | private LLUUID primID; | 653 | private LLUUID primID; |
654 | private bool isScriptRunning; | 654 | private bool isScriptRunning; |
@@ -686,7 +686,7 @@ namespace OpenSim.Region.Capabilities | |||
686 | // "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}", | 686 | // "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}", |
687 | // data, path, param); | 687 | // data, path, param); |
688 | 688 | ||
689 | string res = ""; | 689 | string res = String.Empty; |
690 | LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); | 690 | LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); |
691 | 691 | ||
692 | if (OnUpLoad != null) | 692 | if (OnUpLoad != null) |