aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/CAPSService.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs22
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs8
-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
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs44
-rw-r--r--OpenSim/Framework/Communications/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/Communications/RestClient/RestClient.cs2
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs2
15 files changed, 76 insertions, 73 deletions
diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs
index 40f4006..59cfc06 100644
--- a/OpenSim/Framework/Communications/CAPSService.cs
+++ b/OpenSim/Framework/Communications/CAPSService.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Communications
48 public string CapsRequest(string request, string path, string param) 48 public string CapsRequest(string request, string path, string param)
49 { 49 {
50 System.Console.WriteLine("new caps request " + request + " from path " + path); 50 System.Console.WriteLine("new caps request " + request + " from path " + path);
51 return ""; 51 return System.String.Empty;
52 } 52 }
53 } 53 }
54} \ No newline at end of file 54} \ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 988c558..6d9a0d6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -208,7 +208,7 @@ namespace OpenSim.Framework.Communications.Cache
208 /// <param name="asset"></param> 208 /// <param name="asset"></param>
209 public void AddAsset(AssetBase asset) 209 public void AddAsset(AssetBase asset)
210 { 210 {
211 string temporary = asset.Temporary ? "temporary" : ""; 211 string temporary = asset.Temporary ? "temporary" : String.Empty;
212 string type = asset.Type == 0 ? "texture" : "asset"; 212 string type = asset.Type == 0 ? "texture" : "asset";
213 213
214 string result = "Ignored"; 214 string result = "Ignored";
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index dd1f8ba..74e2093 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -123,8 +123,8 @@ namespace OpenSim.Framework.Communications.Cache
123 public LLUUID TransactionID = LLUUID.Zero; 123 public LLUUID TransactionID = LLUUID.Zero;
124 public bool UploadComplete; 124 public bool UploadComplete;
125 public ulong XferID; 125 public ulong XferID;
126 private string m_name = ""; 126 private string m_name = String.Empty;
127 private string m_description = ""; 127 private string m_description = String.Empty;
128 private sbyte type = 0; 128 private sbyte type = 0;
129 private sbyte invType = 0; 129 private sbyte invType = 0;
130 private uint nextPerm = 0; 130 private uint nextPerm = 0;
@@ -331,12 +331,12 @@ namespace OpenSim.Framework.Communications.Cache
331 // Fields 331 // Fields
332 private BaseHttpServer httpListener; 332 private BaseHttpServer httpListener;
333 private LLUUID inventoryItemID; 333 private LLUUID inventoryItemID;
334 private string m_assetDescription = ""; 334 private string m_assetDescription = String.Empty;
335 private string m_assetName = ""; 335 private string m_assetName = String.Empty;
336 private LLUUID m_folderID; 336 private LLUUID m_folderID;
337 private LLUUID newAssetID; 337 private LLUUID newAssetID;
338 private bool m_dumpImageToFile; 338 private bool m_dumpImageToFile;
339 private string uploaderPath = ""; 339 private string uploaderPath = String.Empty;
340 340
341 // Events 341 // Events
342 public event UpLoadedAsset OnUpLoad; 342 public event UpLoadedAsset OnUpLoad;
@@ -367,7 +367,7 @@ namespace OpenSim.Framework.Communications.Cache
367 public string uploaderCaps(byte[] data, string path, string param) 367 public string uploaderCaps(byte[] data, string path, string param)
368 { 368 {
369 LLUUID inventoryItemID = this.inventoryItemID; 369 LLUUID inventoryItemID = this.inventoryItemID;
370 string text = ""; 370 string text = String.Empty;
371 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); 371 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
372 complete.new_asset = newAssetID.ToString(); 372 complete.new_asset = newAssetID.ToString();
373 complete.new_inventory_item = inventoryItemID; 373 complete.new_inventory_item = inventoryItemID;
@@ -380,7 +380,7 @@ namespace OpenSim.Framework.Communications.Cache
380 } 380 }
381 if (OnUpLoad != null) 381 if (OnUpLoad != null)
382 { 382 {
383 OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", ""); 383 OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, String.Empty, String.Empty);
384 } 384 }
385 return text; 385 return text;
386 } 386 }
@@ -391,10 +391,10 @@ namespace OpenSim.Framework.Communications.Cache
391 // Fields 391 // Fields
392 private BaseHttpServer httpListener; 392 private BaseHttpServer httpListener;
393 private LLUUID inventoryItemID; 393 private LLUUID inventoryItemID;
394 private string m_assetName = ""; 394 private string m_assetName = String.Empty;
395 private LLUUID newAssetID; 395 private LLUUID newAssetID;
396 private bool SaveImages = false; 396 private bool SaveImages = false;
397 private string uploaderPath = ""; 397 private string uploaderPath = String.Empty;
398 398
399 // Events 399 // Events
400 public event UpLoadedAsset OnUpLoad; 400 public event UpLoadedAsset OnUpLoad;
@@ -420,7 +420,7 @@ namespace OpenSim.Framework.Communications.Cache
420 public string uploaderCaps(byte[] data, string path, string param) 420 public string uploaderCaps(byte[] data, string path, string param)
421 { 421 {
422 LLUUID inventoryItemID = this.inventoryItemID; 422 LLUUID inventoryItemID = this.inventoryItemID;
423 string text = ""; 423 string text = String.Empty;
424 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); 424 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
425 complete.new_asset = newAssetID.ToString(); 425 complete.new_asset = newAssetID.ToString();
426 complete.new_inventory_item = inventoryItemID; 426 complete.new_inventory_item = inventoryItemID;
@@ -433,7 +433,7 @@ namespace OpenSim.Framework.Communications.Cache
433 } 433 }
434 if (OnUpLoad != null) 434 if (OnUpLoad != null)
435 { 435 {
436 OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", ""); 436 OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, String.Empty, String.Empty);
437 } 437 }
438 return text; 438 return text;
439 } 439 }
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 46ae9ce..ae07898 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -152,13 +152,13 @@ namespace OpenSim.Framework.Communications.Cache
152 { 152 {
153 string foldersPath 153 string foldersPath
154 = Path.Combine( 154 = Path.Combine(
155 Util.inventoryDir(), config.GetString("foldersFile", "")); 155 Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty));
156 156
157 LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); 157 LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
158 158
159 string itemsPath 159 string itemsPath
160 = Path.Combine( 160 = Path.Combine(
161 Util.inventoryDir(), config.GetString("itemsFile", "")); 161 Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty));
162 162
163 LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); 163 LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
164 } 164 }
@@ -210,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
210 item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString())); 210 item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString()));
211 item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); 211 item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
212 item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString())); 212 item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString()));
213 item.inventoryDescription = config.GetString("description", ""); 213 item.inventoryDescription = config.GetString("description", System.String.Empty);
214 item.inventoryName = config.GetString("name", ""); 214 item.inventoryName = config.GetString("name", System.String.Empty);
215 item.assetType = config.GetInt("assetType", 0); 215 item.assetType = config.GetInt("assetType", 0);
216 item.invType = config.GetInt("inventoryType", 0); 216 item.invType = config.GetInt("inventoryType", 0);
217 item.inventoryCurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); 217 item.inventoryCurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);
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 {
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 0c6d53f..a07b165 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Framework.Communications
136 136
137 public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY) 137 public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY)
138 { 138 {
139 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + ""); 139 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
140 140
141 m_userService.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY); 141 m_userService.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY);
142 UserProfileData userProf = UserService.GetUserProfile(firstName, lastName); 142 UserProfileData userProf = UserService.GetUserProfile(firstName, lastName);
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 2239a9c..7f8658d 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.UserManagement
149 ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock."; 149 ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock.";
150 ErrorReason = "key"; 150 ErrorReason = "key";
151 welcomeMessage = "Welcome to OpenSim!"; 151 welcomeMessage = "Welcome to OpenSim!";
152 seedCapability = ""; 152 seedCapability = String.Empty;
153 home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" + 153 home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" +
154 userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" + 154 userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
155 userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" + 155 userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" +
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 4b2d679..889b70a 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.UserManagement
58 m_userManager = userManager; 58 m_userManager = userManager;
59 m_libraryRootFolder = libraryRootFolder; 59 m_libraryRootFolder = libraryRootFolder;
60 60
61 if (welcomeMess != "") 61 if (welcomeMess != String.Empty)
62 { 62 {
63 m_welcomeMessage = welcomeMess; 63 m_welcomeMessage = welcomeMess;
64 } 64 }
@@ -370,16 +370,16 @@ namespace OpenSim.Framework.UserManagement
370 Hashtable returnactions = new Hashtable(); 370 Hashtable returnactions = new Hashtable();
371 int statuscode = 200; 371 int statuscode = 200;
372 372
373 string firstname = ""; 373 string firstname = String.Empty;
374 string lastname = ""; 374 string lastname = String.Empty;
375 string location = ""; 375 string location = String.Empty;
376 string region =""; 376 string region =String.Empty;
377 string grid = ""; 377 string grid = String.Empty;
378 string channel = ""; 378 string channel = String.Empty;
379 string version = ""; 379 string version = String.Empty;
380 string lang = ""; 380 string lang = String.Empty;
381 string password = ""; 381 string password = String.Empty;
382 string errormessages = ""; 382 string errormessages = String.Empty;
383 383
384 // the client requires the HTML form field be named 'username' 384 // the client requires the HTML form field be named 'username'
385 // however, the data it sends when it loads the first time is 'firstname' 385 // however, the data it sends when it loads the first time is 'firstname'
@@ -387,33 +387,33 @@ namespace OpenSim.Framework.UserManagement
387 387
388 388
389 if (keysvals.Contains("firstname")) 389 if (keysvals.Contains("firstname"))
390 firstname = wfcut.Replace((string)keysvals["firstname"],"",99999); 390 firstname = wfcut.Replace((string)keysvals["firstname"],String.Empty,99999);
391 if (keysvals.Contains("username")) 391 if (keysvals.Contains("username"))
392 firstname = wfcut.Replace((string)keysvals["username"],"",99999); 392 firstname = wfcut.Replace((string)keysvals["username"],String.Empty,99999);
393 393
394 if (keysvals.Contains("lastname")) 394 if (keysvals.Contains("lastname"))
395 lastname = wfcut.Replace((string)keysvals["lastname"],"",99999); 395 lastname = wfcut.Replace((string)keysvals["lastname"],String.Empty,99999);
396 396
397 if (keysvals.Contains("location")) 397 if (keysvals.Contains("location"))
398 location = wfcut.Replace((string)keysvals["location"],"",99999); 398 location = wfcut.Replace((string)keysvals["location"],String.Empty,99999);
399 399
400 if (keysvals.Contains("region")) 400 if (keysvals.Contains("region"))
401 region = wfcut.Replace((string)keysvals["region"],"",99999); 401 region = wfcut.Replace((string)keysvals["region"],String.Empty,99999);
402 402
403 if (keysvals.Contains("grid")) 403 if (keysvals.Contains("grid"))
404 grid = wfcut.Replace((string)keysvals["grid"],"",99999); 404 grid = wfcut.Replace((string)keysvals["grid"],String.Empty,99999);
405 405
406 if (keysvals.Contains("channel")) 406 if (keysvals.Contains("channel"))
407 channel = wfcut.Replace((string)keysvals["channel"],"",99999); 407 channel = wfcut.Replace((string)keysvals["channel"],String.Empty,99999);
408 408
409 if (keysvals.Contains("version")) 409 if (keysvals.Contains("version"))
410 version = wfcut.Replace((string)keysvals["version"],"",99999); 410 version = wfcut.Replace((string)keysvals["version"],String.Empty,99999);
411 411
412 if (keysvals.Contains("lang")) 412 if (keysvals.Contains("lang"))
413 lang = wfcut.Replace((string)keysvals["lang"],"",99999); 413 lang = wfcut.Replace((string)keysvals["lang"],String.Empty,99999);
414 414
415 if (keysvals.Contains("password")) 415 if (keysvals.Contains("password"))
416 password = wfcut.Replace((string)keysvals["password"], "", 99999); 416 password = wfcut.Replace((string)keysvals["password"], String.Empty, 99999);
417 417
418 418
419 // load our login form. 419 // load our login form.
@@ -470,7 +470,7 @@ namespace OpenSim.Framework.UserManagement
470 { 470 {
471 // inject our values in the form at the markers 471 // inject our values in the form at the markers
472 472
473 string loginform=""; 473 string loginform=String.Empty;
474 string file = Path.Combine(Util.configDir(), "http_loginform.html"); 474 string file = Path.Combine(Util.configDir(), "http_loginform.html");
475 if (!File.Exists(file)) 475 if (!File.Exists(file))
476 { 476 {
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
index e9c7bf3..8b6d937 100644
--- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenGrid.Framework.Communications")] 39[assembly : AssemblyProduct("OpenGrid.Framework.Communications")]
40[assembly : AssemblyCopyright("Copyright © 2007")] 40[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs
index 1aaf68e..e4da4dc 100644
--- a/OpenSim/Framework/Communications/RestClient/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Framework.Communications
201 /// <returns>slash '/' if not already present</returns> 201 /// <returns>slash '/' if not already present</returns>
202 private string slash(string s) 202 private string slash(string s)
203 { 203 {
204 return isSlashed(s) ? "" : "/"; 204 return isSlashed(s) ? String.Empty : "/";
205 } 205 }
206 206
207 /// <summary> 207 /// <summary>
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 2d72629..4216553 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -472,7 +472,7 @@ namespace OpenSim.Framework.UserManagement
472 user.username = firstName; 472 user.username = firstName;
473 user.surname = lastName; 473 user.surname = lastName;
474 user.passwordHash = pass; 474 user.passwordHash = pass;
475 user.passwordSalt = ""; 475 user.passwordSalt = String.Empty;
476 user.created = Util.UnixTimeSinceEpoch(); 476 user.created = Util.UnixTimeSinceEpoch();
477 user.homeLookAt = new LLVector3(100, 100, 100); 477 user.homeLookAt = new LLVector3(100, 100, 100);
478 user.homeRegionX = regX; 478 user.homeRegionX = regX;