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
         public string CapsRequest(string request, string path, string param)
         {
             System.Console.WriteLine("new caps request " + request + " from path " + path);
-            return "";
+            return System.String.Empty;
         }
     }
 }
\ 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
         /// <param name="asset"></param>
         public void AddAsset(AssetBase asset)
         {
-            string temporary = asset.Temporary ? "temporary" : "";
+            string temporary = asset.Temporary ? "temporary" : String.Empty;
             string type = asset.Type == 0 ? "texture" : "asset";
 
             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
             public LLUUID TransactionID = LLUUID.Zero;
             public bool UploadComplete;
             public ulong XferID;
-            private string m_name = "";
-            private string m_description = "";
+            private string m_name = String.Empty;
+            private string m_description = String.Empty;
             private sbyte type = 0;
             private sbyte invType = 0;
             private uint nextPerm = 0;
@@ -331,12 +331,12 @@ namespace OpenSim.Framework.Communications.Cache
             // Fields
             private BaseHttpServer httpListener;
             private LLUUID inventoryItemID;
-            private string m_assetDescription = "";
-            private string m_assetName = "";
+            private string m_assetDescription = String.Empty;
+            private string m_assetName = String.Empty;
             private LLUUID m_folderID;
             private LLUUID newAssetID;
             private bool m_dumpImageToFile;
-            private string uploaderPath = "";
+            private string uploaderPath = String.Empty;
 
             // Events
             public event UpLoadedAsset OnUpLoad;
@@ -367,7 +367,7 @@ namespace OpenSim.Framework.Communications.Cache
             public string uploaderCaps(byte[] data, string path, string param)
             {
                 LLUUID inventoryItemID = this.inventoryItemID;
-                string text = "";
+                string text = String.Empty;
                 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
                 complete.new_asset = newAssetID.ToString();
                 complete.new_inventory_item = inventoryItemID;
@@ -380,7 +380,7 @@ namespace OpenSim.Framework.Communications.Cache
                 }
                 if (OnUpLoad != null)
                 {
-                    OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", "");
+                    OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, String.Empty, String.Empty);
                 }
                 return text;
             }
@@ -391,10 +391,10 @@ namespace OpenSim.Framework.Communications.Cache
             // Fields
             private BaseHttpServer httpListener;
             private LLUUID inventoryItemID;
-            private string m_assetName = "";
+            private string m_assetName = String.Empty;
             private LLUUID newAssetID;
             private bool SaveImages = false;
-            private string uploaderPath = "";
+            private string uploaderPath = String.Empty;
 
             // Events
             public event UpLoadedAsset OnUpLoad;
@@ -420,7 +420,7 @@ namespace OpenSim.Framework.Communications.Cache
             public string uploaderCaps(byte[] data, string path, string param)
             {
                 LLUUID inventoryItemID = this.inventoryItemID;
-                string text = "";
+                string text = String.Empty;
                 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
                 complete.new_asset = newAssetID.ToString();
                 complete.new_inventory_item = inventoryItemID;
@@ -433,7 +433,7 @@ namespace OpenSim.Framework.Communications.Cache
                 }
                 if (OnUpLoad != null)
                 {
-                    OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, "", "");
+                    OnUpLoad(m_assetName, "description", newAssetID, inventoryItemID, LLUUID.Zero, data, String.Empty, String.Empty);
                 }
                 return text;
             }
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
         {
             string foldersPath 
                 = Path.Combine(
-                    Util.inventoryDir(), config.GetString("foldersFile", ""));
+                    Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty));
             
             LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
             
             string itemsPath 
                 = Path.Combine(
-                    Util.inventoryDir(), config.GetString("itemsFile", ""));
+                    Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty));
             
             LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
         }
@@ -210,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.inventoryID = new LLUUID(config.GetString("inventoryID", folderID.ToString()));
             item.assetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
             item.parentFolderID = new LLUUID(config.GetString("folderID", folderID.ToString()));
-            item.inventoryDescription = config.GetString("description", "");
-            item.inventoryName = config.GetString("name", "");
+            item.inventoryDescription = config.GetString("description", System.String.Empty);
+            item.inventoryName = config.GetString("name", System.String.Empty);
             item.assetType = config.GetInt("assetType", 0);
             item.invType = config.GetInt("inventoryType", 0);
             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
         {
             Console.WriteLine("texture request " + request);
             // Needs implementing (added to remove compiler warning)
-            return "";
+            return String.Empty;
         }
 
         #region EventQueue (Currently not enabled)
@@ -211,7 +211,7 @@ namespace OpenSim.Region.Capabilities
         /// <returns></returns>
         public string ProcessEventQueue(string request, string path, string param)
         {
-            string res = "";
+            string res = String.Empty;
 
             if (m_capsEventQueue.Count > 0)
             {
@@ -476,17 +476,17 @@ namespace OpenSim.Region.Capabilities
         {
             public event UpLoadedAsset OnUpLoad;
 
-            private string uploaderPath = "";
+            private string uploaderPath = String.Empty;
             private LLUUID newAssetID;
             private LLUUID inventoryItemID;
             private LLUUID parentFolder;
             private BaseHttpServer httpListener;
             private bool m_dumpAssetsToFile;
-            private string m_assetName = "";
-            private string m_assetDes = "";
+            private string m_assetName = String.Empty;
+            private string m_assetDes = String.Empty;
 
-            private string m_invType = "";
-            private string m_assetType = "";
+            private string m_invType = String.Empty;
+            private string m_assetType = String.Empty;
 
             public AssetUploader(string assetName, string description, LLUUID assetID, LLUUID inventoryItem,
                                  LLUUID parentFolderID, string invType, string assetType, string path,
@@ -514,7 +514,7 @@ namespace OpenSim.Region.Capabilities
             public string uploaderCaps(byte[] data, string path, string param)
             {
                 LLUUID inv = inventoryItemID;
-                string res = "";
+                string res = String.Empty;
                 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
                 uploadComplete.new_asset = newAssetID.ToString();
                 uploadComplete.new_inventory_item = inv;
@@ -568,7 +568,7 @@ namespace OpenSim.Region.Capabilities
         {
             public event UpdateItem OnUpLoad;
 
-            private string uploaderPath = "";
+            private string uploaderPath = String.Empty;
             private LLUUID inventoryItemID;
             private BaseHttpServer httpListener;
             private bool m_dumpAssetToFile;
@@ -592,7 +592,7 @@ namespace OpenSim.Region.Capabilities
             public string uploaderCaps(byte[] data, string path, string param)
             {
                 LLUUID inv = inventoryItemID;
-                string res = "";
+                string res = String.Empty;
                 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
                 LLUUID assetID = LLUUID.Zero;
 
@@ -648,7 +648,7 @@ namespace OpenSim.Region.Capabilities
         {
             public event UpdateTaskScript OnUpLoad;
 
-            private string uploaderPath = "";
+            private string uploaderPath = String.Empty;
             private LLUUID inventoryItemID;
             private LLUUID primID;
             private bool isScriptRunning;
@@ -686,7 +686,7 @@ namespace OpenSim.Region.Capabilities
 //                        "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}", 
 //                        data, path, param);
 
-                    string res = "";
+                    string res = String.Empty;
                     LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
 
                     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 @@
 * 
 */
 using libsecondlife;
+using System;
 
 namespace OpenSim.Region.Capabilities
 {
     [LLSDType("MAP")]
     public class LLSDAssetUploadComplete
     {
-        public string new_asset = "";
+        public string new_asset = String.Empty;
         public LLUUID new_inventory_item = LLUUID.Zero;
-        public string state = "";
+        public string state = String.Empty;
         //public bool success = false;
 
         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
     [LLSDMap]
     public class LLSDAssetUploadRequest
     {
-        public string asset_type = "";
-        public string description = "";
+        public string asset_type = System.String.Empty;
+        public string description = System.String.Empty;
         public LLUUID folder_id = LLUUID.Zero;
-        public string inventory_type = "";
-        public string name = "";
+        public string inventory_type = System.String.Empty;
+        public string name = System.String.Empty;
 
         public LLSDAssetUploadRequest()
         {
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
     [LLSDMap]
     public class LLSDAssetUploadResponse
     {
-        public string uploader = "";
-        public string state = "";
+        public string uploader = System.String.Empty;
+        public string state = System.String.Empty;
 
         public LLSDAssetUploadResponse()
         {
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 @@
 * 
 */
 
+using System;
+
 namespace OpenSim.Region.Capabilities
 {
     [LLSDType("MAP")]
     public class LLSDCapsDetails
     {
-        public string MapLayer = "";
-        public string NewFileAgentInventory = "";
-        //public string EventQueueGet = "";
-        // public string RequestTextureDownload = "";
-        // public string ChatSessionRequest = "";
-        public string UpdateNotecardAgentInventory = "";
-        public string UpdateScriptAgentInventory = "";
-        public string UpdateScriptTaskInventory = "";
-        // public string ParcelVoiceInfoRequest = "";
+        public string MapLayer = String.Empty;
+        public string NewFileAgentInventory = String.Empty;
+        //public string EventQueueGet = String.Empty;
+        // public string RequestTextureDownload = String.Empty;
+        // public string ChatSessionRequest = String.Empty;
+        public string UpdateNotecardAgentInventory = String.Empty;
+        public string UpdateScriptAgentInventory = String.Empty;
+        public string UpdateScriptTaskInventory = String.Empty;
+        // public string ParcelVoiceInfoRequest = String.Empty;
 
         public LLSDCapsDetails()
         {
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
 
         public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY)
         {
-            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + "");
+            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
 
             m_userService.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY);
             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
             ErrorMessage = "You have entered an invalid name/password combination.  Check Caps/lock.";
             ErrorReason = "key";
             welcomeMessage = "Welcome to OpenSim!";
-            seedCapability = "";
+            seedCapability = String.Empty;
             home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" +
                    userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
                    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
             m_userManager = userManager;
             m_libraryRootFolder = libraryRootFolder;
             
-            if (welcomeMess != "")
+            if (welcomeMess != String.Empty)
             {
                 m_welcomeMessage = welcomeMess;
             }
@@ -370,16 +370,16 @@ namespace OpenSim.Framework.UserManagement
             Hashtable returnactions = new Hashtable();
             int statuscode = 200;
 
-            string firstname = "";
-            string lastname = "";
-            string location = "";
-            string region ="";
-            string grid = "";
-            string channel = "";
-            string version = "";
-            string lang = "";
-            string password = "";
-            string errormessages = "";
+            string firstname = String.Empty;
+            string lastname = String.Empty;
+            string location = String.Empty;
+            string region =String.Empty;
+            string grid = String.Empty;
+            string channel = String.Empty;
+            string version = String.Empty;
+            string lang = String.Empty;
+            string password = String.Empty;
+            string errormessages = String.Empty;
 
             // the client requires the HTML form field be named 'username'
             // however, the data it sends when it loads the first time is 'firstname'
@@ -387,33 +387,33 @@ namespace OpenSim.Framework.UserManagement
 
             
             if (keysvals.Contains("firstname"))
-                firstname = wfcut.Replace((string)keysvals["firstname"],"",99999);
+                firstname = wfcut.Replace((string)keysvals["firstname"],String.Empty,99999);
             if (keysvals.Contains("username"))
-                firstname = wfcut.Replace((string)keysvals["username"],"",99999);
+                firstname = wfcut.Replace((string)keysvals["username"],String.Empty,99999);
 
             if (keysvals.Contains("lastname"))
-                lastname = wfcut.Replace((string)keysvals["lastname"],"",99999);
+                lastname = wfcut.Replace((string)keysvals["lastname"],String.Empty,99999);
 
             if (keysvals.Contains("location"))
-                location = wfcut.Replace((string)keysvals["location"],"",99999);
+                location = wfcut.Replace((string)keysvals["location"],String.Empty,99999);
 
             if (keysvals.Contains("region"))
-                region = wfcut.Replace((string)keysvals["region"],"",99999);
+                region = wfcut.Replace((string)keysvals["region"],String.Empty,99999);
 
             if (keysvals.Contains("grid"))
-                grid = wfcut.Replace((string)keysvals["grid"],"",99999);
+                grid = wfcut.Replace((string)keysvals["grid"],String.Empty,99999);
 
             if (keysvals.Contains("channel"))
-                channel = wfcut.Replace((string)keysvals["channel"],"",99999);
+                channel = wfcut.Replace((string)keysvals["channel"],String.Empty,99999);
 
             if (keysvals.Contains("version"))
-                version = wfcut.Replace((string)keysvals["version"],"",99999);
+                version = wfcut.Replace((string)keysvals["version"],String.Empty,99999);
 
             if (keysvals.Contains("lang"))
-                lang = wfcut.Replace((string)keysvals["lang"],"",99999);
+                lang = wfcut.Replace((string)keysvals["lang"],String.Empty,99999);
            
             if (keysvals.Contains("password"))
-                password = wfcut.Replace((string)keysvals["password"], "", 99999);
+                password = wfcut.Replace((string)keysvals["password"], String.Empty, 99999);
 
             
             // load our login form.
@@ -470,7 +470,7 @@ namespace OpenSim.Framework.UserManagement
         {
             // inject our values in the form at the markers
 
-            string loginform="";
+            string loginform=String.Empty;
             string file = Path.Combine(Util.configDir(), "http_loginform.html");
             if (!File.Exists(file))
             {
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;
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("")]
 [assembly : AssemblyProduct("OpenGrid.Framework.Communications")]
-[assembly : AssemblyCopyright("Copyright ©  2007")]
+[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
 
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
         /// <returns>slash '/' if not already present</returns>
         private string slash(string s)
         {
-            return isSlashed(s) ? "" : "/";
+            return isSlashed(s) ? String.Empty : "/";
         }
 
         /// <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
             user.username = firstName;
             user.surname = lastName;
             user.passwordHash = pass;
-            user.passwordSalt = "";
+            user.passwordSalt = String.Empty;
             user.created = Util.UnixTimeSinceEpoch();
             user.homeLookAt = new LLVector3(100, 100, 100);
             user.homeRegionX = regX;