From b25f9f322cdbcde7fd8c043137bf07992e5ef318 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 15 Jan 2008 02:09:55 +0000 Subject: * 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. --- OpenSim/Framework/AgentCircuitData.cs | 4 +- OpenSim/Framework/AgentInventory.cs | 4 +- OpenSim/Framework/AssemblyInfo.cs | 30 ++++++- OpenSim/Framework/AssetBase.cs | 4 +- OpenSim/Framework/AssetConfig.cs | 6 +- .../Filesystem/AssetLoaderFileSystem.cs | 6 +- OpenSim/Framework/Communications/CAPSService.cs | 2 +- .../Framework/Communications/Cache/AssetCache.cs | 2 +- .../Communications/Cache/AssetTransactions.cs | 22 +++--- .../Communications/Cache/LibraryRootFolder.cs | 8 +- .../Framework/Communications/Capabilities/Caps.cs | 24 +++--- .../Capabilities/LLSDAssetUploadComplete.cs | 5 +- .../Capabilities/LLSDAssetUploadRequest.cs | 8 +- .../Capabilities/LLSDAssetUploadResponse.cs | 4 +- .../Communications/Capabilities/LLSDCapsDetails.cs | 20 ++--- .../Communications/CommunicationsManager.cs | 2 +- OpenSim/Framework/Communications/LoginResponse.cs | 2 +- OpenSim/Framework/Communications/LoginService.cs | 44 +++++------ .../Communications/Properties/AssemblyInfo.cs | 2 +- .../Communications/RestClient/RestClient.cs | 2 +- .../Framework/Communications/UserManagerBase.cs | 2 +- .../Configuration/HTTP/HTTPConfiguration.cs | 2 +- .../Configuration/HTTP/RemoteConfigSettings.cs | 2 +- .../Configuration/XML/XmlConfiguration.cs | 4 +- OpenSim/Framework/ConfigurationMember.cs | 18 ++--- OpenSim/Framework/ConfigurationOption.cs | 8 +- OpenSim/Framework/Console/AssemblyInfo.cs | 10 +-- OpenSim/Framework/Console/LogBase.cs | 4 +- .../Framework/Data.DB4o/Properties/AssemblyInfo.cs | 30 ++++++- OpenSim/Framework/Data.MSSQL/MSSQLManager.cs | 12 +-- .../Data.MSSQL/Properties/AssemblyInfo.cs | 30 ++++++- OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 10 +-- OpenSim/Framework/Data.MySQL/MySQLGridData.cs | 6 +- OpenSim/Framework/Data.MySQL/MySQLManager.cs | 12 +-- OpenSim/Framework/Data.MySQL/MySQLUserData.cs | 6 +- .../Data.MySQL/Properties/AssemblyInfo.cs | 30 ++++++- .../Data.SQLite/Properties/AssemblyInfo.cs | 30 ++++++- OpenSim/Framework/Data.SQLite/SQLiteBase.cs | 4 +- OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs | 4 +- OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | 4 +- OpenSim/Framework/Data/Properties/AssemblyInfo.cs | 30 ++++++- OpenSim/Framework/Data/RegionProfileData.cs | 28 +++---- OpenSim/Framework/Data/ReservationData.cs | 8 +- OpenSim/Framework/EstateSettings.cs | 92 +++++++++++----------- OpenSim/Framework/GridConfig.cs | 22 +++--- OpenSim/Framework/InventoryConfig.cs | 10 +-- OpenSim/Framework/LandData.cs | 7 +- OpenSim/Framework/Login.cs | 2 +- OpenSim/Framework/MessageServerConfig.cs | 18 ++--- OpenSim/Framework/NetworkServersInfo.cs | 17 ++-- OpenSim/Framework/RegionCommsListener.cs | 3 +- OpenSim/Framework/RegionInfo.cs | 16 ++-- .../RegionLoader/Web/RegionLoaderWebServer.cs | 6 +- OpenSim/Framework/Servers/BaseHttpServer.cs | 2 +- OpenSim/Framework/TaskInventoryItem.cs | 41 +++++----- OpenSim/Framework/UserConfig.cs | 14 ++-- OpenSim/Framework/Util.cs | 2 +- 57 files changed, 465 insertions(+), 282 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 65a072f..43ade36 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs @@ -61,7 +61,7 @@ namespace OpenSim.Framework public bool child; public LLUUID InventoryFolder; public LLUUID BaseFolder; - public string CapsPath = ""; + public string CapsPath = String.Empty; } [Serializable] @@ -100,6 +100,6 @@ namespace OpenSim.Framework public bool child; public Guid InventoryFolder; public Guid BaseFolder; - public string CapsPath = ""; + public string CapsPath = String.Empty; } } \ No newline at end of file diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs index 84a782b..83040a3 100644 --- a/OpenSim/Framework/AgentInventory.cs +++ b/OpenSim/Framework/AgentInventory.cs @@ -234,7 +234,7 @@ namespace OpenSim.Framework public LLUUID CreatorID; public sbyte InvType; public sbyte Type; - public string Name = ""; + public string Name = System.String.Empty; public string Description; public InventoryItem() @@ -245,7 +245,7 @@ namespace OpenSim.Framework public string ExportString() { string typ = "notecard"; - string result = ""; + string result = System.String.Empty; result += "\tinv_object\t0\n\t{\n"; result += "\t\tobj_id\t%s\n"; result += "\t\tparent_id\t" + ItemID.ToString() + "\n"; diff --git a/OpenSim/Framework/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs index b3206a7..1507d67 100644 --- a/OpenSim/Framework/AssemblyInfo.cs +++ b/OpenSim/Framework/AssemblyInfo.cs @@ -1,3 +1,31 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + using System.Reflection; using System.Runtime.InteropServices; @@ -10,7 +38,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OpenSim.FrameWork")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 2bef61b..aa33f63 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs @@ -37,8 +37,8 @@ namespace OpenSim.Framework public LLUUID FullID; public sbyte Type; public sbyte InvType; - public string Name = ""; - public string Description = ""; + public string Name = String.Empty; + public string Description = String.Empty; public bool Local = false; public bool Temporary = false; diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs index f85129b..9989bfd 100644 --- a/OpenSim/Framework/AssetConfig.cs +++ b/OpenSim/Framework/AssetConfig.cs @@ -26,6 +26,8 @@ * */ +using System; + namespace OpenSim.Framework { /// @@ -33,9 +35,9 @@ namespace OpenSim.Framework /// public class AssetConfig { - public string DefaultStartupMsg = ""; + public string DefaultStartupMsg = String.Empty; - public string DatabaseProvider = ""; + public string DatabaseProvider = String.Empty; public static uint DefaultHttpPort = 8003; public uint HttpPort = DefaultHttpPort; diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index d6ce0c5..59db3d6 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs @@ -99,7 +99,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem for (int i = 0; i < source.Configs.Count; i++) { - assetSetPath = source.Configs[i].GetString("file", ""); + assetSetPath = source.Configs[i].GetString("file", String.Empty); LoadXmlAssetSet(Path.Combine(Util.assetsDir(), assetSetPath), assets); } @@ -138,10 +138,10 @@ namespace OpenSim.Framework.AssetLoader.Filesystem for (int i = 0; i < source.Configs.Count; i++) { string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString()); - string name = source.Configs[i].GetString("name", ""); + string name = source.Configs[i].GetString("name", String.Empty); sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); - string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", "")); + string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty)); AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false); 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 /// 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 /// 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 /// slash '/' if not already present private string slash(string s) { - return isSlashed(s) ? "" : "/"; + return isSlashed(s) ? String.Empty : "/"; } /// 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; diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs index 0d48683..e27c88b 100644 --- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs +++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs @@ -39,7 +39,7 @@ namespace OpenSim.Framework.Configuration.HTTP private XmlConfiguration xmlConfig; - private string configFileName = ""; + private string configFileName = System.String.Empty; public HTTPConfiguration() { diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs index 8fddb60..8575d3b 100644 --- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs +++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs @@ -32,7 +32,7 @@ namespace OpenSim.Framework.Configuration.HTTP { private ConfigurationMember configMember; - public string baseConfigURL = ""; + public string baseConfigURL = System.String.Empty; public RemoteConfigSettings(string filename) { diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs index 8bb31f8..4c50e53 100644 --- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs +++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs @@ -71,9 +71,9 @@ namespace OpenSim.Framework.Configuration else { createdFile = true; - rootNode = doc.CreateNode(XmlNodeType.Element, "Root", ""); + rootNode = doc.CreateNode(XmlNodeType.Element, "Root", String.Empty); doc.AppendChild(rootNode); - configNode = doc.CreateNode(XmlNodeType.Element, "Config", ""); + configNode = doc.CreateNode(XmlNodeType.Element, "Config", String.Empty); rootNode.AppendChild(configNode); } diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs index 4ae59d6..7590495 100644 --- a/OpenSim/Framework/ConfigurationMember.cs +++ b/OpenSim/Framework/ConfigurationMember.cs @@ -44,8 +44,8 @@ namespace OpenSim.Framework public delegate void ConfigurationOptionsLoad(); private List configurationOptions = new List(); - private string configurationFilename = ""; - private string configurationDescription = ""; + private string configurationFilename = String.Empty; + private string configurationDescription = String.Empty; private XmlNode configurationFromXMLNode = null; private ConfigurationOptionsLoad loadFunction; private ConfigurationOptionResult resultFunction; @@ -70,7 +70,7 @@ namespace OpenSim.Framework public ConfigurationMember(XmlNode configuration_xml, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error) { - configurationFilename = ""; + configurationFilename = String.Empty; configurationFromXMLNode = configuration_xml; configurationDescription = configuration_description; loadFunction = load_function; @@ -100,8 +100,8 @@ namespace OpenSim.Framework private void checkAndAddConfigOption(ConfigurationOption option) { - if ((option.configurationKey != "" && option.configurationQuestion != "") || - (option.configurationKey != "" && option.configurationUseDefaultNoPrompt)) + if ((option.configurationKey != String.Empty && option.configurationQuestion != String.Empty) || + (option.configurationKey != String.Empty && option.configurationUseDefaultNoPrompt)) { if (!configurationOptions.Contains(option)) { @@ -190,7 +190,7 @@ namespace OpenSim.Framework return; } - if (configurationFilename.Trim() != "") + if (configurationFilename.Trim() != String.Empty) { configurationPlugin.SetFileName(configurationFilename); try @@ -220,11 +220,11 @@ namespace OpenSim.Framework { bool convertSuccess = false; object return_result = null; - string errorMessage = ""; + string errorMessage = String.Empty; bool ignoreNextFromConfig = false; while (convertSuccess == false) { - string console_result = ""; + string console_result = String.Empty; string attribute = null; if (useFile || configurationFromXMLNode != null) { @@ -250,7 +250,7 @@ namespace OpenSim.Framework configOption.shouldIBeAsked(configOption.configurationKey)) || configOption.shouldIBeAsked == null) { - if (configurationDescription.Trim() != "") + if (configurationDescription.Trim() != String.Empty) { console_result = MainLog.Instance.CmdPrompt( diff --git a/OpenSim/Framework/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs index 7f9b5b5..d8be6f8 100644 --- a/OpenSim/Framework/ConfigurationOption.cs +++ b/OpenSim/Framework/ConfigurationOption.cs @@ -26,6 +26,8 @@ * */ +using System; + namespace OpenSim.Framework { public class ConfigurationOption @@ -52,9 +54,9 @@ namespace OpenSim.Framework TYPE_DOUBLE } ; - public string configurationKey = ""; - public string configurationQuestion = ""; - public string configurationDefault = ""; + public string configurationKey = String.Empty; + public string configurationQuestion = String.Empty; + public string configurationDefault = String.Empty; public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; public bool configurationUseDefaultNoPrompt = false; diff --git a/OpenSim/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs index 73ecd18..b321170 100644 --- a/OpenSim/Framework/Console/AssemblyInfo.cs +++ b/OpenSim/Framework/Console/AssemblyInfo.cs @@ -36,12 +36,12 @@ using System.Runtime.InteropServices; [assembly : AssemblyTitle("ServerConsole")] [assembly : AssemblyDescription("")] -[assembly : AssemblyConfiguration("")] -[assembly : AssemblyCompany("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] [assembly : AssemblyProduct("ServerConsole")] -[assembly : AssemblyCopyright("")] -[assembly : AssemblyTrademark("")] -[assembly : AssemblyCulture("")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs index e7b1945..6235c07 100644 --- a/OpenSim/Framework/Console/LogBase.cs +++ b/OpenSim/Framework/Console/LogBase.cs @@ -298,7 +298,7 @@ namespace OpenSim.Framework.Console catch (Exception e) { MainLog.Instance.Error("Console", "System.Console.ReadLine exception " + e.ToString()); - return ""; + return String.Empty; } } @@ -377,7 +377,7 @@ namespace OpenSim.Framework.Console public string CmdPrompt(string prompt, string defaultresponse) { string temp = CmdPrompt(String.Format("{0} [{1}]", prompt, defaultresponse)); - if (temp == "") + if (temp == String.Empty) { return defaultresponse; } diff --git a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs index 6183b6e..af181e4 100644 --- a/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs @@ -1,3 +1,31 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + using System.Reflection; using System.Runtime.InteropServices; @@ -10,7 +38,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OpenSim.Framework.Data.DB4o")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs index bf57492..3a70909 100644 --- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs +++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs @@ -186,7 +186,7 @@ namespace OpenSim.Framework.Data.MSSQL protected static string defineTable(DataTable dt) { string sql = "create table " + dt.TableName + "("; - string subsql = ""; + string subsql = String.Empty; foreach (DataColumn col in dt.Columns) { if (subsql.Length > 0) @@ -337,7 +337,7 @@ namespace OpenSim.Framework.Data.MSSQL // World Map Addition string tempRegionMap = reader["regionMapTexture"].ToString(); - if (tempRegionMap != "") + if (tempRegionMap != String.Empty) { regionprofile.regionMapTextureID = new LLUUID(tempRegionMap); } @@ -644,12 +644,12 @@ namespace OpenSim.Framework.Data.MSSQL parameters["homeLookAtZ"] = homeLookAtZ.ToString(); parameters["created"] = created.ToString(); parameters["lastLogin"] = lastlogin.ToString(); - parameters["userInventoryURI"] = ""; - parameters["userAssetURI"] = ""; + parameters["userInventoryURI"] = String.Empty; + parameters["userAssetURI"] = String.Empty; parameters["profileCanDoMask"] = "0"; parameters["profileWantDoMask"] = "0"; - parameters["profileAboutText"] = ""; - parameters["profileFirstText"] = ""; + parameters["profileAboutText"] = String.Empty; + parameters["profileFirstText"] = String.Empty; parameters["profileImage"] = LLUUID.Zero.ToString(); parameters["profileFirstImage"] = LLUUID.Zero.ToString(); parameters["webLoginKey"] = LLUUID.Random().ToString(); diff --git a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs index 6846ecf..a91ce62 100644 --- a/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs @@ -1,3 +1,31 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + using System.Reflection; using System.Runtime.InteropServices; @@ -10,7 +38,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index 8055448..26985b3 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs @@ -485,7 +485,7 @@ namespace OpenSim.Framework.Data.MySQL foreach (DataColumn column in table.Columns) Debug.Write(column.ColumnName + " = " + row[column, DataRowVersion.Original] + ", "); - Debug.WriteLine(""); + Debug.WriteLine(String.Empty); } //--- Display the current values, if there are any. if (row.HasVersion(DataRowVersion.Current)) @@ -494,9 +494,9 @@ namespace OpenSim.Framework.Data.MySQL foreach (DataColumn column in table.Columns) Debug.Write(column.ColumnName + " = " + row[column, DataRowVersion.Current] + ", "); - Debug.WriteLine(""); + Debug.WriteLine(String.Empty); } - Debug.WriteLine(""); + Debug.WriteLine(String.Empty); } } } @@ -1313,7 +1313,7 @@ namespace OpenSim.Framework.Data.MySQL private MySqlCommand createUpdateCommand(string table, string pk, DataTable dt) { string sql = "update " + table + " set "; - string subsql = ""; + string subsql = String.Empty; foreach (DataColumn col in dt.Columns) { if (subsql.Length > 0) @@ -1341,7 +1341,7 @@ namespace OpenSim.Framework.Data.MySQL private string defineTable(DataTable dt) { string sql = "create table " + dt.TableName + "("; - string subsql = ""; + string subsql = String.Empty; foreach (DataColumn col in dt.Columns) { if (subsql.Length > 0) diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs index 7cfac12..c8c4ab0 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs @@ -219,8 +219,8 @@ namespace OpenSim.Framework.Data.MySQL if (querysplit.Length == 2) { Dictionary param = new Dictionary(); - param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; - param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], "") + "%"; + param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%"; + param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%"; try { lock (database) @@ -258,7 +258,7 @@ namespace OpenSim.Framework.Data.MySQL lock (database) { Dictionary param = new Dictionary(); - param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; + param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], System.String.Empty) + "%"; IDbCommand result = database.Query( diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs index 7645df3..15ccf5f 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs @@ -323,7 +323,7 @@ namespace OpenSim.Framework.Data.MySQL // World Map Addition string tempRegionMap = reader["regionMapTexture"].ToString(); - if (tempRegionMap != "") + if (tempRegionMap != String.Empty) { retval.regionMapTextureID = new LLUUID(tempRegionMap); } @@ -572,12 +572,12 @@ namespace OpenSim.Framework.Data.MySQL parameters["?homeLookAtZ"] = homeLookAtZ.ToString(); parameters["?created"] = created.ToString(); parameters["?lastLogin"] = lastlogin.ToString(); - parameters["?userInventoryURI"] = ""; - parameters["?userAssetURI"] = ""; + parameters["?userInventoryURI"] = String.Empty; + parameters["?userAssetURI"] = String.Empty; parameters["?profileCanDoMask"] = "0"; parameters["?profileWantDoMask"] = "0"; - parameters["?profileAboutText"] = ""; - parameters["?profileFirstText"] = ""; + parameters["?profileAboutText"] = String.Empty; + parameters["?profileFirstText"] = String.Empty; parameters["?profileImage"] = LLUUID.Zero.ToString(); parameters["?profileFirstImage"] = LLUUID.Zero.ToString(); parameters["?webLoginKey"] = LLUUID.Random().ToString(); @@ -612,7 +612,7 @@ namespace OpenSim.Framework.Data.MySQL { bool GRID_ONLY_UPDATE_NECESSARY_DATA = false; - string sql = ""; + string sql = String.Empty; if (GRID_ONLY_UPDATE_NECESSARY_DATA) { sql += "INSERT INTO "; diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs index 76ad551..f637db6 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs @@ -347,8 +347,8 @@ namespace OpenSim.Framework.Data.MySQL if (querysplit.Length == 2) { Dictionary param = new Dictionary(); - param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; - param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], "") + "%"; + param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%"; + param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%"; try { lock (database) @@ -386,7 +386,7 @@ namespace OpenSim.Framework.Data.MySQL lock (database) { Dictionary param = new Dictionary(); - param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], "") + "%"; + param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%"; IDbCommand result = database.Query( diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs index 7024bfa..b33d319 100644 --- a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs @@ -1,3 +1,31 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + using System.Reflection; using System.Runtime.InteropServices; @@ -10,7 +38,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OpenSim.Framework.Data.MySQL")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs index 6693c98..5de87c1 100644 --- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs @@ -1,3 +1,31 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + using System.Reflection; using System.Runtime.InteropServices; @@ -10,7 +38,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs index 9131a41..87d63a5 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs @@ -98,7 +98,7 @@ namespace OpenSim.Framework.Data.SQLite protected static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) { string sql = "update " + table + " set "; - string subsql = ""; + string subsql = String.Empty; foreach (DataColumn col in dt.Columns) { if (subsql.Length > 0) @@ -126,7 +126,7 @@ namespace OpenSim.Framework.Data.SQLite protected static string defineTable(DataTable dt) { string sql = "create table " + dt.TableName + "("; - string subsql = ""; + string subsql = String.Empty; foreach (DataColumn col in dt.Columns) { if (subsql.Length > 0) diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs index 33b4111..1fd5c47 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs @@ -1368,7 +1368,7 @@ namespace OpenSim.Framework.Data.SQLite private SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) { string sql = "update " + table + " set "; - string subsql = ""; + string subsql = String.Empty; foreach (DataColumn col in dt.Columns) { if (subsql.Length > 0) @@ -1396,7 +1396,7 @@ namespace OpenSim.Framework.Data.SQLite private string defineTable(DataTable dt) { string sql = "create table " + dt.TableName + "("; - string subsql = ""; + string subsql = String.Empty; foreach (DataColumn col in dt.Columns) { if (subsql.Length > 0) diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs index c4a874f..7647d02 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs @@ -630,7 +630,7 @@ namespace OpenSim.Framework.Data.SQLite { if (row[col] == null) { - row[col] = ""; + row[col] = String.Empty; } } } @@ -671,7 +671,7 @@ namespace OpenSim.Framework.Data.SQLite { if (row[col] == null) { - row[col] = ""; + row[col] = String.Empty; } } } diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs index 51050d1..57cf4cf 100644 --- a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs @@ -1,3 +1,31 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + using System.Reflection; using System.Runtime.InteropServices; @@ -10,7 +38,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OpenSim.Framework.Data")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Framework/Data/RegionProfileData.cs b/OpenSim/Framework/Data/RegionProfileData.cs index ec50baa..779e98c 100644 --- a/OpenSim/Framework/Data/RegionProfileData.cs +++ b/OpenSim/Framework/Data/RegionProfileData.cs @@ -41,7 +41,7 @@ namespace OpenSim.Framework.Data /// /// The name of the region /// - public string regionName = ""; + public string regionName = String.Empty; /// /// A 64-bit number combining map position into a (mostly) unique ID @@ -65,10 +65,10 @@ namespace OpenSim.Framework.Data /// Authentication secrets /// /// Not very secure, needs improvement. - public string regionSendKey = ""; + public string regionSendKey = String.Empty; - public string regionRecvKey = ""; - public string regionSecret = ""; + public string regionRecvKey = String.Empty; + public string regionSecret = String.Empty; /// /// Whether the region is online @@ -78,14 +78,14 @@ namespace OpenSim.Framework.Data /// /// Information about the server that the region is currently hosted on /// - public string serverIP = ""; + public string serverIP = String.Empty; public uint serverPort; - public string serverURI = ""; + public string serverURI = String.Empty; public uint httpPort; public uint remotingPort; - public string httpServerURI = ""; + public string httpServerURI = String.Empty; /// /// Set of optional overrides. Can be used to create non-eulicidean spaces. @@ -100,23 +100,23 @@ namespace OpenSim.Framework.Data /// Optional: URI Location of the region database /// /// Used for floating sim pools where the region data is not nessecarily coupled to a specific server - public string regionDataURI = ""; + public string regionDataURI = String.Empty; /// /// Region Asset Details /// - public string regionAssetURI = ""; + public string regionAssetURI = String.Empty; - public string regionAssetSendKey = ""; - public string regionAssetRecvKey = ""; + public string regionAssetSendKey = String.Empty; + public string regionAssetRecvKey = String.Empty; /// /// Region Userserver Details /// - public string regionUserURI = ""; + public string regionUserURI = String.Empty; - public string regionUserSendKey = ""; - public string regionUserRecvKey = ""; + public string regionUserSendKey = String.Empty; + public string regionUserRecvKey = String.Empty; /// /// Region Map Texture Asset diff --git a/OpenSim/Framework/Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs index 285f9ca..187ff32 100644 --- a/OpenSim/Framework/Data/ReservationData.cs +++ b/OpenSim/Framework/Data/ReservationData.cs @@ -37,11 +37,11 @@ namespace OpenSim.Framework.Data public int reservationMaxX = 65536; public int reservationMaxY = 65536; - public string reservationName = ""; - public string reservationCompany = ""; + public string reservationName = System.String.Empty; + public string reservationCompany = System.String.Empty; public bool status = true; - public string gridSendKey = ""; - public string gridRecvKey = ""; + public string gridSendKey = System.String.Empty; + public string gridRecvKey = System.String.Empty; } } \ No newline at end of file diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index b2bd181..b5a3468 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs @@ -756,106 +756,106 @@ namespace OpenSim.Framework public void loadConfigurationOptions() { - configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", + configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0.0", true); - configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", + configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "0", true); configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, - "", "0", true); - configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40", + String.Empty, "0", true); + configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "40", true); configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, - "", "1.0", true); - configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", + String.Empty, "1.0", true); + configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty, "0", true); - configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", + configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, String.Empty, "0", true); - configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", + configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, String.Empty, "0", true); - configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", + configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, String.Empty, "21", true); - configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", + configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0", true); configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, - "", "0", true); + String.Empty, "0", true); configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, - "", "0", true); - configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", + String.Empty, "0", true); + configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "false", true); configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, - "", "1", true); + String.Empty, "1", true); configMember.addConfigurationOption("region_water_height", - ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true); + ConfigurationOption.ConfigurationTypes.TYPE_UINT16, String.Empty, "20", true); configMember.addConfigurationOption("region_allow_terraform", - ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", true); + ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, "true", true); - configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", + configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty, "b8d3965a-ad78-bf43-699b-bff8eca6c975", true); - configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", + configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty, "abb783e6-3e93-26c0-248a-247666855da3", true); - configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", + configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty, "179cdabd-398a-9b6b-1391-4dc333ba321f", true); - configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", + configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, String.Empty, "beb169c7-11ea-fff2-efe5-0f24dc881df2", true); configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("terrain_start_height_0", - ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true); configMember.addConfigurationOption("terrain_start_height_1", - ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true); configMember.addConfigurationOption("terrain_start_height_2", - ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true); configMember.addConfigurationOption("terrain_start_height_3", - ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "10.0", true); configMember.addConfigurationOption("terrain_height_range_0", - ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true); configMember.addConfigurationOption("terrain_height_range_1", - ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true); configMember.addConfigurationOption("terrain_height_range_2", - ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true); configMember.addConfigurationOption("terrain_height_range_3", - ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); + ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "60.0", true); configMember.addConfigurationOption("terrain_file", - ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "", + ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, String.Empty, "default.r32", true); configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, - "", "60.0", true); - configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", + String.Empty, "60.0", true); + configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, String.Empty, "20.0", true); configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_4", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_5", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_6", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_7", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_8", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); configMember.addConfigurationOption("estate_manager_9", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, - "", "00000000-0000-0000-0000-000000000000", true); + String.Empty, "00000000-0000-0000-0000-000000000000", true); } diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index c07adea..61a53d7 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs @@ -26,23 +26,25 @@ * */ +using System; + namespace OpenSim.Framework { public class GridConfig { - public string GridOwner = ""; - public string DefaultAssetServer = ""; - public string AssetSendKey = ""; - public string AssetRecvKey = ""; + public string GridOwner = String.Empty; + public string DefaultAssetServer = String.Empty; + public string AssetSendKey = String.Empty; + public string AssetRecvKey = String.Empty; - public string DefaultUserServer = ""; - public string UserSendKey = ""; - public string UserRecvKey = ""; + public string DefaultUserServer = String.Empty; + public string UserSendKey = String.Empty; + public string UserRecvKey = String.Empty; - public string SimSendKey = ""; - public string SimRecvKey = ""; + public string SimSendKey = String.Empty; + public string SimRecvKey = String.Empty; - public string DatabaseProvider = ""; + public string DatabaseProvider = String.Empty; public static uint DefaultHttpPort = 8001; diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs index 28cd552..108e7ff 100644 --- a/OpenSim/Framework/InventoryConfig.cs +++ b/OpenSim/Framework/InventoryConfig.cs @@ -33,12 +33,12 @@ namespace OpenSim.Framework /// public class InventoryConfig { - public string DefaultStartupMsg = ""; - public string UserServerURL = ""; - public string UserSendKey = ""; - public string UserRecvKey = ""; + public string DefaultStartupMsg = System.String.Empty; + public string UserServerURL = System.String.Empty; + public string UserSendKey = System.String.Empty; + public string UserRecvKey = System.String.Empty; - public string DatabaseProvider = ""; + public string DatabaseProvider = System.String.Empty; public static uint DefaultHttpPort = 8004; public uint HttpPort = DefaultHttpPort; diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 885545d..bb99b27 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs @@ -26,6 +26,7 @@ * */ using System.Collections.Generic; +using System; using libsecondlife; namespace OpenSim.Framework @@ -34,7 +35,7 @@ namespace OpenSim.Framework { public byte[] landBitmapByteArray = new byte[512]; public string landName = "Your Parcel"; - public string landDesc = ""; + public string landDesc = String.Empty; public LLUUID ownerID = LLUUID.Zero; public bool isGroupOwned = false; public LLVector3 AABBMin = new LLVector3(); @@ -67,8 +68,8 @@ namespace OpenSim.Framework public int localID = 0; public LLUUID globalID = LLUUID.Zero; - public string mediaURL = ""; - public string musicURL = ""; + public string mediaURL = String.Empty; + public string musicURL = String.Empty; public float passHours = 0; public int passPrice = 0; public LLUUID snapshotID = LLUUID.Zero; diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs index 5228fe9..7021194 100644 --- a/OpenSim/Framework/Login.cs +++ b/OpenSim/Framework/Login.cs @@ -39,7 +39,7 @@ namespace OpenSim.Framework public LLUUID InventoryFolder; public LLUUID BaseFolder; public uint CircuitCode; - public string CapsPath = ""; + public string CapsPath = System.String.Empty; public LLVector3 StartPos; public Login() diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs index 5cef362..ccb6e7a 100644 --- a/OpenSim/Framework/MessageServerConfig.cs +++ b/OpenSim/Framework/MessageServerConfig.cs @@ -36,17 +36,17 @@ namespace OpenSim.Framework /// public class MessageServerConfig { - public string DefaultStartupMsg = ""; - public string UserServerURL = ""; - public string UserSendKey = ""; - public string UserRecvKey = ""; + public string DefaultStartupMsg = String.Empty; + public string UserServerURL = String.Empty; + public string UserSendKey = String.Empty; + public string UserRecvKey = String.Empty; - public string GridServerURL = ""; - public string GridSendKey = ""; - public string GridRecvKey = ""; + public string GridServerURL = String.Empty; + public string GridSendKey = String.Empty; + public string GridRecvKey = String.Empty; - public string DatabaseProvider = ""; - public string GridCommsProvider = ""; + public string DatabaseProvider = String.Empty; + public string GridCommsProvider = String.Empty; public static uint DefaultHttpPort = 8006; public static bool DefaultHttpSSL = false; diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index cf1457d..c67a6bf 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs @@ -27,23 +27,24 @@ */ using Nini.Config; +using System; namespace OpenSim.Framework { public class NetworkServersInfo { public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; - public string AssetSendKey = ""; + public string AssetSendKey = String.Empty; - public string GridURL = ""; - public string GridSendKey = ""; - public string GridRecvKey = ""; - public string UserURL = ""; - public string UserSendKey = ""; - public string UserRecvKey = ""; + public string GridURL = String.Empty; + public string GridSendKey = String.Empty; + public string GridRecvKey = String.Empty; + public string UserURL = String.Empty; + public string UserSendKey = String.Empty; + public string UserRecvKey = String.Empty; public bool isSandbox; - public string InventoryURL = ""; + public string InventoryURL = String.Empty; public static uint DefaultHttpListenerPort = 9000; public uint HttpListenerPort = DefaultHttpListenerPort; diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index 9472a9e..1db5aae 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs @@ -27,6 +27,7 @@ */ using System.Collections.Generic; +using System; using libsecondlife; namespace OpenSim.Framework @@ -46,7 +47,7 @@ namespace OpenSim.Framework public event ChildAgentUpdate OnChildAgentUpdate; - public string debugRegionName = ""; + public string debugRegionName = String.Empty; /// diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 3c4fcba..8d4e905 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -157,17 +157,17 @@ namespace OpenSim.Framework public class RegionInfo : SimpleRegionInfo { - public string RegionName = ""; + public string RegionName = String.Empty; - public string DataStore = ""; + public string DataStore = String.Empty; public bool isSandbox = false; public bool commFailTF = false; public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; public LLUUID CovenantID = LLUUID.Zero; - public string MasterAvatarFirstName = ""; - public string MasterAvatarLastName = ""; - public string MasterAvatarSandboxPassword = ""; + public string MasterAvatarFirstName = String.Empty; + public string MasterAvatarLastName = String.Empty; + public string MasterAvatarSandboxPassword = String.Empty; // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. private static EstateSettings m_estateSettings; @@ -241,7 +241,7 @@ namespace OpenSim.Framework //not in use, should swap to nini though. public void LoadFromNiniSource(IConfigSource source, string sectionName) { - string errorMessage = ""; + string errorMessage = String.Empty; RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString())); RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); @@ -275,7 +275,7 @@ namespace OpenSim.Framework MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User"); MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test"); - if (errorMessage != "") + if (errorMessage != String.Empty) { // a error } @@ -384,7 +384,7 @@ namespace OpenSim.Framework break; case "master_avatar_pass": string tempMD5Passwd = (string) configuration_result; - MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); + MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); break; } diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs index 80acbae..8a1a038 100644 --- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs +++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs @@ -52,8 +52,8 @@ namespace OpenSim.Framework.RegionLoader.Web else { IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; - string url = startupConfig.GetString("regionload_webserver_url", "").Trim(); - if (url == "") + string url = startupConfig.GetString("regionload_webserver_url", System.String.Empty).Trim(); + if (url == System.String.Empty) { MainLog.Instance.Error("WEBLOADER", "Unable to load webserver URL - URL was empty."); return null; @@ -66,7 +66,7 @@ namespace OpenSim.Framework.RegionLoader.Web HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); MainLog.Instance.Debug("WEBLOADER", "Downloading Region Information From Remote Server..."); StreamReader reader = new StreamReader(webResponse.GetResponseStream()); - string xmlSource = ""; + string xmlSource = System.String.Empty; string tempStr = reader.ReadLine(); while (tempStr != null) { diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 78554c3..df3b049 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -382,7 +382,7 @@ namespace OpenSim.Framework.Servers Hashtable keysvals = new Hashtable(); Hashtable headervals = new Hashtable(); - string host = ""; + string host = String.Empty; string[] querystringkeys = request.QueryString.AllKeys; string[] rHeaders = request.Headers.AllKeys; diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 196e096..107993b 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs @@ -27,6 +27,7 @@ */ using libsecondlife; +using System; namespace OpenSim.Framework { @@ -44,16 +45,16 @@ namespace OpenSim.Framework { "texture", "sound", - "", - "", - "", - "", - "", - "", - "", - "", + String.Empty, + String.Empty, + String.Empty, + String.Empty, + String.Empty, + String.Empty, + String.Empty, + String.Empty, "lsl_text", - "" + String.Empty }; /// @@ -63,16 +64,16 @@ namespace OpenSim.Framework { "texture", "sound", - "", - "", - "", - "", - "", - "", - "", - "", + String.Empty, + String.Empty, + String.Empty, + String.Empty, + String.Empty, + String.Empty, + String.Empty, + String.Empty, "lsltext", - "" + String.Empty }; public LLUUID item_id = LLUUID.Zero; @@ -92,8 +93,8 @@ namespace OpenSim.Framework public int type = 0; public int inv_type = 0; public uint flags = 0; - public string name = ""; - public string desc = ""; + public string name = String.Empty; + public string desc = String.Empty; public uint creation_date = 0; public LLUUID ParentPartID = LLUUID.Zero; diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index c9957ef..a4b8a5d 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs @@ -26,6 +26,8 @@ * */ +using System; + namespace OpenSim.Framework { /// @@ -33,14 +35,14 @@ namespace OpenSim.Framework /// public class UserConfig { - public string DefaultStartupMsg = ""; - public string GridServerURL = ""; - public string GridSendKey = ""; - public string GridRecvKey = ""; + public string DefaultStartupMsg = String.Empty; + public string GridServerURL = String.Empty; + public string GridSendKey = String.Empty; + public string GridRecvKey = String.Empty; - public string InventoryUrl = ""; + public string InventoryUrl = String.Empty; - public string DatabaseProvider = ""; + public string DatabaseProvider = String.Empty; public static uint DefaultHttpPort = 8002; public static bool DefaultHttpSSL = false; diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index f80350e..191205b 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -356,7 +356,7 @@ namespace OpenSim.Framework { return capsURLS[userID]; } - return ""; + return String.Empty; } public static void SetCapsURL(LLUUID userID, string url) -- cgit v1.1