aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities
diff options
context:
space:
mode:
authorAdam Frisby2008-01-15 02:09:55 +0000
committerAdam Frisby2008-01-15 02:09:55 +0000
commitb25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch)
tree7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Framework/Communications/Capabilities
parentSet svn:eol-style. (diff)
downloadopensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip
opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz
opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2
opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz
* Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them * Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs24
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs5
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs8
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs20
5 files changed, 32 insertions, 29 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)
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index f838c85..e0afa5c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -26,15 +26,16 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using System;
29 30
30namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
31{ 32{
32 [LLSDType("MAP")] 33 [LLSDType("MAP")]
33 public class LLSDAssetUploadComplete 34 public class LLSDAssetUploadComplete
34 { 35 {
35 public string new_asset = ""; 36 public string new_asset = String.Empty;
36 public LLUUID new_inventory_item = LLUUID.Zero; 37 public LLUUID new_inventory_item = LLUUID.Zero;
37 public string state = ""; 38 public string state = String.Empty;
38 //public bool success = false; 39 //public bool success = false;
39 40
40 public LLSDAssetUploadComplete() 41 public LLSDAssetUploadComplete()
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index 7fed27a..e611eea 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -33,11 +33,11 @@ namespace OpenSim.Region.Capabilities
33 [LLSDMap] 33 [LLSDMap]
34 public class LLSDAssetUploadRequest 34 public class LLSDAssetUploadRequest
35 { 35 {
36 public string asset_type = ""; 36 public string asset_type = System.String.Empty;
37 public string description = ""; 37 public string description = System.String.Empty;
38 public LLUUID folder_id = LLUUID.Zero; 38 public LLUUID folder_id = LLUUID.Zero;
39 public string inventory_type = ""; 39 public string inventory_type = System.String.Empty;
40 public string name = ""; 40 public string name = System.String.Empty;
41 41
42 public LLSDAssetUploadRequest() 42 public LLSDAssetUploadRequest()
43 { 43 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index 3ad618d..7744ffb 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -31,8 +31,8 @@ namespace OpenSim.Region.Capabilities
31 [LLSDMap] 31 [LLSDMap]
32 public class LLSDAssetUploadResponse 32 public class LLSDAssetUploadResponse
33 { 33 {
34 public string uploader = ""; 34 public string uploader = System.String.Empty;
35 public string state = ""; 35 public string state = System.String.Empty;
36 36
37 public LLSDAssetUploadResponse() 37 public LLSDAssetUploadResponse()
38 { 38 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
index 7b09cb3..7006b44 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
@@ -26,20 +26,22 @@
26* 26*
27*/ 27*/
28 28
29using System;
30
29namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
30{ 32{
31 [LLSDType("MAP")] 33 [LLSDType("MAP")]
32 public class LLSDCapsDetails 34 public class LLSDCapsDetails
33 { 35 {
34 public string MapLayer = ""; 36 public string MapLayer = String.Empty;
35 public string NewFileAgentInventory = ""; 37 public string NewFileAgentInventory = String.Empty;
36 //public string EventQueueGet = ""; 38 //public string EventQueueGet = String.Empty;
37 // public string RequestTextureDownload = ""; 39 // public string RequestTextureDownload = String.Empty;
38 // public string ChatSessionRequest = ""; 40 // public string ChatSessionRequest = String.Empty;
39 public string UpdateNotecardAgentInventory = ""; 41 public string UpdateNotecardAgentInventory = String.Empty;
40 public string UpdateScriptAgentInventory = ""; 42 public string UpdateScriptAgentInventory = String.Empty;
41 public string UpdateScriptTaskInventory = ""; 43 public string UpdateScriptTaskInventory = String.Empty;
42 // public string ParcelVoiceInfoRequest = ""; 44 // public string ParcelVoiceInfoRequest = String.Empty;
43 45
44 public LLSDCapsDetails() 46 public LLSDCapsDetails()
45 { 47 {