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. --- .../LoadRegions/Properties/AssemblyInfo.cs | 30 ++++++- .../RemoteController/RemoteAdminPlugin.cs | 14 ++-- 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 +- .../Grid/AssetServer/Properties/AssemblyInfo.cs | 2 +- OpenSim/Grid/GridServer/GridManager.cs | 12 +-- OpenSim/Grid/GridServer/Main.cs | 8 +- OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs | 2 +- OpenSim/Grid/MessagingServer/UserPresenceData.cs | 2 +- OpenSim/Grid/ScriptServer/Application.cs | 4 +- .../Grid/ScriptServer/Properties/AssemblyInfo.cs | 30 ++++++- .../ScriptServer/ScriptEngineLoader.cs | 6 +- OpenSim/Grid/UserServer/Main.cs | 6 +- OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs | 30 ++++++- OpenSim/Region/Application/Application.cs | 4 +- OpenSim/Region/Application/OpenSimMain.cs | 22 +++--- OpenSim/Region/ClientStack/ClientView.cs | 6 +- .../Communications/Local/LocalBackEndServices.cs | 4 +- .../Communications/Local/LocalUserServices.cs | 2 +- .../Local/Properties/AssemblyInfo.cs | 30 ++++++- .../Region/Communications/OGS1/OGS1GridServices.cs | 4 +- .../Region/Communications/OGS1/OGS1UserServices.cs | 4 +- .../Communications/OGS1/Properties/AssemblyInfo.cs | 30 ++++++- .../Environment/Modules/AvatarProfilesModule.cs | 2 +- OpenSim/Region/Environment/Modules/XMLRPCModule.cs | 2 +- OpenSim/Region/Environment/Modules/XferModule.cs | 2 +- .../Region/Environment/Scenes/Scene.Inventory.cs | 2 +- OpenSim/Region/Environment/Scenes/Scene.cs | 10 +-- .../Scenes/SceneCommunicationService.cs | 2 +- .../Region/Environment/Scenes/SceneObjectGroup.cs | 4 +- .../Scenes/SceneObjectPart.Inventory.cs | 4 +- .../Region/Environment/Scenes/SceneObjectPart.cs | 8 +- .../Environment/Scenes/Scripting/NullScriptHost.cs | 6 +- .../Scenes/Scripting/ScriptEngineLoader.cs | 6 +- .../Region/Environment/Types/BasicQuadTreeNode.cs | 2 +- OpenSim/Region/Examples/SimpleApp/Program.cs | 2 +- .../Examples/SimpleApp/Properties/AssemblyInfo.cs | 32 +++++++- .../Engines/CSharp/Examples/ExportRegionToLSL.cs | 6 +- .../Engines/JVMEngine/JVM/ClassRecord.cs | 14 ++-- .../Engines/JVMEngine/JVM/Interpreter.Methods.cs | 4 +- .../Region/Physics/BulletXPlugin/BulletXPlugin.cs | 2 +- OpenSim/Region/Physics/Meshing/SimpleHull.cs | 2 +- OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 +- OpenSim/Region/ScriptEngine/Common/Executor.cs | 4 +- .../Region/ScriptEngine/Common/LSL_BaseClass.cs | 2 +- .../ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 58 +++++++------- OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 4 +- .../ScriptEngine/Common/Properties/AssemblyInfo.cs | 30 ++++++- .../Common/ScriptEngineBase/EventManager.cs | 2 +- .../Common/ScriptEngineBase/EventQueueManager.cs | 2 +- .../Common/ScriptEngineBase/LSLLongCmdHandler.cs | 2 +- .../Common/ScriptEngineBase/ScriptManager.cs | 2 +- .../DotNetEngine/Compiler/LSL/Compiler.cs | 2 +- .../DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 37 ++++----- .../DotNetEngine/Properties/AssemblyInfo.cs | 30 ++++++- .../ScriptEngine/DotNetEngine/ScriptManager.cs | 2 +- .../Region/ScriptEngine/LSOEngine/LSO/Engine.cs | 6 +- .../ScriptEngine/LSOEngine/LSO/LSO_Parser.cs | 2 +- .../LSOEngine/Properties/AssemblyInfo.cs | 30 ++++++- .../Region/ScriptEngine/LSOEngine/ScriptManager.cs | 2 +- .../RemoteServer/Properties/AssemblyInfo.cs | 30 ++++++- .../OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | 4 +- .../Properties/AssemblyInfo.cs | 30 ++++++- .../Properties/AssemblyInfo.cs | 2 +- OpenSim/Tools/Export/OpenSimExport.cs | 2 +- 120 files changed, 945 insertions(+), 453 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs index ffb3e48..638ed33 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/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.Addin")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index cce58c2..fa76078 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -48,7 +48,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions { private OpenSimMain m_app; private BaseHttpServer m_httpd; - private string requiredPassword = ""; + private string requiredPassword = String.Empty; public void Initialise(OpenSimMain openSim) { @@ -57,7 +57,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) { MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); - requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", ""); + requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty); m_app = openSim; m_httpd = openSim.HttpServer; @@ -83,7 +83,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions LLUUID regionID = new LLUUID((string) requestData["regionID"]); Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != String.Empty && (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) { responseData["accepted"] = "false"; @@ -116,7 +116,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions Hashtable requestData = (Hashtable) request.Params[0]; Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != String.Empty && (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) { responseData["accepted"] = "false"; @@ -142,7 +142,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions Hashtable requestData = (Hashtable)request.Params[0]; Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != String.Empty && (!requestData.Contains("password") || (string)requestData["password"] != requiredPassword)) { responseData["accepted"] = "false"; @@ -180,7 +180,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable) request.Params[0]; Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != String.Empty && (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) { responseData["accepted"] = "false"; @@ -236,7 +236,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions XmlRpcResponse response = new XmlRpcResponse(); Hashtable requestData = (Hashtable) request.Params[0]; Hashtable responseData = new Hashtable(); - if (requiredPassword != "" && + if (requiredPassword != System.String.Empty && (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) { responseData["created"] = "false"; 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) diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs index d598094..7c659dd 100644 --- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OGS-AssetServer")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 1e21d9e..b4b91bb 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -194,7 +194,7 @@ namespace OpenSim.Grid.GridServer /// An XML string containing neighbour entities public string GetXMLNeighbours(ulong reqhandle) { - string response = ""; + string response = String.Empty; RegionProfileData central_region = getRegion(reqhandle); RegionProfileData neighbour; for (int x = -1; x < 2; x++) @@ -241,7 +241,7 @@ namespace OpenSim.Grid.GridServer { TheSim = getRegion(new LLUUID((string)requestData["UUID"])); - // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); + // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod",String.Empty, 5,"Region attempting login with UUID."); } else { @@ -615,7 +615,7 @@ namespace OpenSim.Grid.GridServer /// public string RestGetRegionMethod(string request, string path, string param) { - return RestGetSimMethod("", "/sims/", param); + return RestGetSimMethod(String.Empty, "/sims/", param); } /// @@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer /// public string RestSetRegionMethod(string request, string path, string param) { - return RestSetSimMethod("", "/sims/", param); + return RestSetSimMethod(String.Empty, "/sims/", param); } /// @@ -704,7 +704,7 @@ namespace OpenSim.Grid.GridServer TheSim.regionRecvKey = config.SimRecvKey; TheSim.regionSendKey = config.SimSendKey; TheSim.regionSecret = config.SimRecvKey; - TheSim.regionDataURI = ""; + TheSim.regionDataURI = String.Empty; TheSim.regionAssetURI = config.DefaultAssetServer; TheSim.regionAssetRecvKey = config.AssetRecvKey; TheSim.regionAssetSendKey = config.AssetSendKey; @@ -776,7 +776,7 @@ namespace OpenSim.Grid.GridServer { kvp.Value.AddProfile(TheSim); MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); - logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5, + logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", String.Empty, 5, "Region successfully updated and connected to grid."); } else diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index 6bb4c75..d4947b3 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs @@ -149,7 +149,7 @@ namespace OpenSim.Grid.GridServer /* foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values) { - string SimResponse = ""; + string SimResponse = String.Empty; try { WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/"); @@ -158,7 +158,7 @@ namespace OpenSim.Grid.GridServer CheckSim.ContentLength = 0; StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII); - stOut.Write(""); + stOut.Write(String.Empty); stOut.Close(); StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream()); @@ -204,9 +204,9 @@ namespace OpenSim.Grid.GridServer { try { - string attri = ""; + string attri = String.Empty; attri = configData.GetAttribute("DataBaseProvider"); - if (attri == "") + if (attri == String.Empty) { GridDll = "OpenSim.Framework.Data.DB4o.dll"; configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs index 6f837e6..df06c90 100644 --- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OGS-GridServer")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs index fdc5d10..5470d32 100644 --- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs +++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs @@ -39,7 +39,7 @@ namespace OpenSim.Grid.MessagingServer { public AgentCircuitData agentData = new AgentCircuitData(); public RegionProfileData regionData = new RegionProfileData(); - public string httpURI = ""; + public string httpURI = String.Empty; public List friendData = new List (); public List subscriptionData = new List(); diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs index 70dfcd3..5857101 100644 --- a/OpenSim/Grid/ScriptServer/Application.cs +++ b/OpenSim/Grid/ScriptServer/Application.cs @@ -47,9 +47,9 @@ namespace OpenSim.Grid.ScriptServer private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) { - Console.WriteLine(""); + Console.WriteLine(String.Empty); Console.WriteLine("APPLICATION EXCEPTION DETECTED"); - Console.WriteLine(""); + Console.WriteLine(String.Empty); Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString()); //Console.WriteLine("Exception:"); //Console.WriteLine(e.ExceptionObject.ToString()); diff --git a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs index 2886ec7..539d55a 100644 --- a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/ScriptServer/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.Grid.ScriptServer")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs index aefaa10..c9c0fb0 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs @@ -87,7 +87,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer //} //catch (Exception e) //{ - // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString()); + // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString()); //} @@ -104,7 +104,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer //} //catch (Exception e) //{ - // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); + // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); //} ScriptServerInterfaces.ScriptEngine ret; @@ -114,7 +114,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer //} //catch (Exception e) //{ - // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); + // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); //} return ret; diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index f40c6f6..00a1641 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -147,7 +147,7 @@ namespace OpenSim.Grid.UserServer regX = Convert.ToUInt32(m_console.CmdPrompt("Start Region X")); regY = Convert.ToUInt32(m_console.CmdPrompt("Start Region Y")); - tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); + tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); LLUUID userID = new LLUUID(); try @@ -220,9 +220,9 @@ namespace OpenSim.Grid.UserServer { try { - string attri = ""; + string attri = String.Empty; attri = configData.GetAttribute("DataBaseProvider"); - if (attri == "") + if (attri == String.Empty) { StorageDll = "OpenSim.Framework.Data.DB4o.dll"; configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs index 079e05e..06d4a0e 100644 --- a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/UserServer/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("OGS-UserServer")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index ca1e9c9..d253775 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -45,7 +45,7 @@ namespace OpenSim Console.Write("Performing compatibility checks... "); - string supported = ""; + string supported = String.Empty; if (Util.IsEnvironmentSupported(ref supported)) { Console.WriteLine(" Environment is compatible.\n"); @@ -90,7 +90,7 @@ namespace OpenSim // TODO: Add config option to allow users to turn off error reporting // TODO: Post error report (disabled for now) - string msg = ""; + string msg = String.Empty; msg += "\r\n"; msg += "APPLICATION EXCEPTION DETECTED: " + e.ToString() + "\r\n"; msg += "\r\n"; diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 7249322..7d83df7 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -172,8 +172,8 @@ namespace OpenSim config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_prim_inventories_experimental", false); - config.Set("startup_console_commands_file", ""); - config.Set("shutdown_console_commands_file", ""); + config.Set("startup_console_commands_file", String.Empty); + config.Set("shutdown_console_commands_file", String.Empty); config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); config.Set("asset_database", "sqlite"); } @@ -252,8 +252,8 @@ namespace OpenSim m_storagePersistPrimInventories = startupConfig.GetBoolean("storage_prim_inventories_experimental", false); - m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); - m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); + m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); + m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); @@ -374,7 +374,7 @@ namespace OpenSim // } //Run Startup Commands - if (m_startupCommandsFile != "") + if (m_startupCommandsFile != String.Empty) { RunCommandScript(m_startupCommandsFile); } @@ -421,7 +421,7 @@ namespace OpenSim SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll"); sqlAssetServer.LoadDefaultAssets(); assetServer = sqlAssetServer; - //assetServer = new GridAssetClient(""); + //assetServer = new GridAssetClient(String.Empty); } else { @@ -585,7 +585,7 @@ namespace OpenSim /// public virtual void Shutdown() { - if (m_startupCommandsFile != "") + if (m_startupCommandsFile != String.Empty) { RunCommandScript(m_shutdownCommandsFile); } @@ -622,10 +622,10 @@ namespace OpenSim if (File.Exists(fileName)) { StreamReader readFile = File.OpenText(fileName); - string currentCommand = ""; + string currentCommand = String.Empty; while ((currentCommand = readFile.ReadLine()) != null) { - if (currentCommand != "") + if (currentCommand != String.Empty) { MainLog.Instance.Verbose("COMMANDFILE", "Running '" + currentCommand + "'"); MainLog.Instance.MainLogRunCommand(currentCommand); @@ -645,7 +645,7 @@ namespace OpenSim /// Additional arguments passed to the command public void RunCmd(string command, string[] cmdparams) { - string result = ""; + string result = String.Empty; switch (command) { @@ -982,7 +982,7 @@ namespace OpenSim private string CombineParams(string[] commandParams, int pos) { - string result = ""; + string result = String.Empty; for (int i = pos; i < commandParams.Length; i++) { result += commandParams[i] + " "; diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index c937fab..d3a8254 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -343,7 +343,7 @@ namespace OpenSim.Region.ClientStack { if (m_debug > 0) { - string info = ""; + string info = String.Empty; if (m_debug < 255 && packet.Type == PacketType.AgentUpdate) return; if (m_debug < 254 && packet.Type == PacketType.ViewerEffect) @@ -783,7 +783,7 @@ namespace OpenSim.Region.ClientStack agentData.child = false; agentData.firstname = m_firstName; agentData.lastname = m_lastName; - agentData.CapsPath = ""; + agentData.CapsPath = String.Empty; return agentData; } @@ -2521,7 +2521,7 @@ namespace OpenSim.Region.ClientStack case PacketType.ChatFromViewer: ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; - string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname; + string fromName = String.Empty; //ClientAvatar.firstname + " " + ClientAvatar.lastname; byte[] message = inchatpack.ChatData.Message; byte type = inchatpack.ChatData.Type; LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 4dec884..8cba6fd 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs @@ -45,7 +45,7 @@ namespace OpenSim.Region.Communications.Local private Dictionary m_queuedGridSettings = new Dictionary(); - public string _gdebugRegionName = ""; + public string _gdebugRegionName = System.String.Empty; public string gdebugRegionName { @@ -53,7 +53,7 @@ namespace OpenSim.Region.Communications.Local set { _gdebugRegionName = value; } } - public string _rdebugRegionName = ""; + public string _rdebugRegionName = System.String.Empty; public string rdebugRegionName { diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 6269565..e02a600 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs @@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.Local public override UserProfileData SetupMasterUser(string firstName, string lastName) { - return SetupMasterUser(firstName, lastName, ""); + return SetupMasterUser(firstName, lastName, String.Empty); } public override UserProfileData SetupMasterUser(string firstName, string lastName, string password) diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs index 481577e..1f73d1a 100644 --- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Communications/Local/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.Region.Communications.Local")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index e1d29bc..e3d10b5 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.OGS1 public BaseHttpServer httpListener; public NetworkServersInfo serversInfo; public BaseHttpServer httpServer; - public string _gdebugRegionName = ""; + public string _gdebugRegionName = String.Empty; public string gdebugRegionName { @@ -63,7 +63,7 @@ namespace OpenSim.Region.Communications.OGS1 set { _gdebugRegionName = value; } } - public string _rdebugRegionName = ""; + public string _rdebugRegionName = String.Empty; public string rdebugRegionName { diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index e645074..36ab4bb 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -144,7 +144,7 @@ namespace OpenSim.Region.Communications.OGS1 { Hashtable param = new Hashtable(); param["queryid"] = (string) queryID.ToString(); - param["avquery"] = objAlphaNumericPattern.Replace(query, ""); + param["avquery"] = objAlphaNumericPattern.Replace(query, String.Empty); IList parameters = new ArrayList(); parameters.Add(param); XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters); @@ -212,7 +212,7 @@ namespace OpenSim.Region.Communications.OGS1 public UserProfileData SetupMasterUser(string firstName, string lastName) { - return SetupMasterUser(firstName, lastName, ""); + return SetupMasterUser(firstName, lastName, String.Empty); } public UserProfileData SetupMasterUser(string firstName, string lastName, string password) diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs index 631cfd0..2aa5739 100644 --- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Communications/OGS1/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("OpenGrid.Framework.Communications.OGS1")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs index 1b7e2a4..66c9fd5 100644 --- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs @@ -87,7 +87,7 @@ namespace OpenSim.Region.Environment.Modules string bornOn = "Before now"; string flAbout = "First life? What is one of those? OpenSim is my life!"; LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000"); - remoteClient.SendAvatarProperties(avatarID, about, bornOn, "", flAbout, 0, LLUUID.Zero, LLUUID.Zero, "", + remoteClient.SendAvatarProperties(avatarID, about, bornOn, System.String.Empty, flAbout, 0, LLUUID.Zero, LLUUID.Zero, System.String.Empty, partner); } } diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs index 481ba3f..76c6a53 100644 --- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs @@ -331,7 +331,7 @@ namespace OpenSim.Region.Environment.Modules m_ChannelKey = channelKey; m_MessageID = LLUUID.Random(); m_processed = false; - m_resp = ""; + m_resp = String.Empty; } public bool IsProcessed() diff --git a/OpenSim/Region/Environment/Modules/XferModule.cs b/OpenSim/Region/Environment/Modules/XferModule.cs index 807b46c..f8da9af 100644 --- a/OpenSim/Region/Environment/Modules/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/XferModule.cs @@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules public class XferDownLoad { public byte[] Data = new byte[0]; - public string FileName = ""; + public string FileName = String.Empty; public ulong XferID = 0; public int DataPointer = 0; public uint Packet = 0; diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index db3da48..31bd0b3 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -376,7 +376,7 @@ namespace OpenSim.Region.Environment.Scenes InventoryItemBase item = userInfo.RootFolder.HasItem(itemID); if (item != null) { - if (newName != "") + if (newName != System.String.Empty) { item.inventoryName = newName; } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 575fe01..43486e8 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -389,7 +389,7 @@ namespace OpenSim.Region.Environment.Scenes m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes"); m_restartTimer.Start(); - SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in 2 Minutes"); + SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes"); //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes"); } } @@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Scenes if (m_RestartTimerCounter <= m_incrementsof15seconds) { if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7) - SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in " + + SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter) * 15) + " seconds"); // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) + @@ -1408,7 +1408,7 @@ namespace OpenSim.Region.Environment.Scenes { if (regionHandle == m_regInfo.RegionHandle) { - if (agent.CapsPath != "") + if (agent.CapsPath != String.Empty) { Caps cap = new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, @@ -2004,7 +2004,7 @@ namespace OpenSim.Region.Environment.Scenes private string CombineParams(string[] commandParams, int pos) { - string result = ""; + string result = String.Empty; for (int i = pos; i < commandParams.Length; i++) { result += commandParams[i] + " "; @@ -2253,7 +2253,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// AvatarID to lookup /// - public bool PresenceChildStatus(LLUUID avatarID) + public override bool PresenceChildStatus(LLUUID avatarID) { ScenePresence cp = GetScenePresence(avatarID); return cp.IsChildAgent; diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 3942397..29747c1 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes public KillObjectDelegate KillObject; - public string _debugRegionName = ""; + public string _debugRegionName = String.Empty; public string debugRegionName { diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 879e4a3..ffc72c9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Environment.Scenes { return part.Name; } - return ""; + return String.Empty; } public string GetPartDescription(uint localID) @@ -1124,7 +1124,7 @@ namespace OpenSim.Region.Environment.Scenes { return part.Description; } - return ""; + return String.Empty; } /// diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 1dd7e35..fc74c4e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Scenes { public partial class SceneObjectPart : IScriptHost { - private string m_inventoryFileName = ""; + private string m_inventoryFileName = String.Empty; /// /// The inventory folder for this prim @@ -334,7 +334,7 @@ namespace OpenSim.Region.Environment.Scenes public class InventoryStringBuilder { - public string BuildString = ""; + public string BuildString = String.Empty; public InventoryStringBuilder(LLUUID folderID, LLUUID parentID) { diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 4456182..f2594a9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -395,7 +395,7 @@ namespace OpenSim.Region.Environment.Scenes set { m_acceleration = value; } } - private string m_description = ""; + private string m_description = String.Empty; public string Description { @@ -418,7 +418,7 @@ namespace OpenSim.Region.Environment.Scenes } } - private string m_text = ""; + private string m_text = String.Empty; public Vector3 SitTargetPosition { @@ -440,7 +440,7 @@ namespace OpenSim.Region.Environment.Scenes } } - private string m_sitName = ""; + private string m_sitName = String.Empty; public string SitName { @@ -448,7 +448,7 @@ namespace OpenSim.Region.Environment.Scenes set { m_sitName = value; } } - private string m_touchName = ""; + private string m_touchName = String.Empty; public string TouchName { diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs index c1bf72b..58cf4c6 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs @@ -44,19 +44,19 @@ namespace OpenSim.Region.Environment.Scenes.Scripting public string SitName { - get { return ""; } + get { return String.Empty; } set { } } public string TouchName { - get { return ""; } + get { return String.Empty; } set { } } public string Description { - get { return ""; } + get { return String.Empty; } set { } } diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs index 5dbe500..74f9358 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs @@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting //} //catch (Exception e) //{ - // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString()); + // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString()); //} @@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting //} //catch (Exception e) //{ - // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); + // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); //} ScriptEngineInterface ret; @@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting //} //catch (Exception e) //{ - // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); + // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); //} return ret; diff --git a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs index 70b957e..e654d2d 100644 --- a/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs +++ b/OpenSim/Region/Environment/Types/BasicQuadTreeNode.cs @@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Types public string[] GetNeighbours(string nodeName) { string[] retVal = new string[1]; - retVal[0] = ""; + retVal[0] = System.String.Empty; return retVal; } } diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 9844f9e..8b8bcf4 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs @@ -88,7 +88,7 @@ namespace SimpleApp m_commsManager = localComms; LocalLoginService loginService = - new LocalLoginService(userService, "", localComms, m_networkServersInfo, false); + new LocalLoginService(userService, String.Empty, localComms, m_networkServersInfo, false); loginService.OnLoginToRegion += backendService.AddNewSession; m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); diff --git a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs index a5c8f05..564dfee 100644 --- a/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Examples/SimpleApp/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; @@ -8,9 +36,9 @@ using System.Runtime.InteropServices; [assembly : AssemblyTitle("SimpleApp")] [assembly : AssemblyDescription("")] [assembly : AssemblyConfiguration("")] -[assembly : AssemblyCompany("Playahead AB")] +[assembly : AssemblyCompany("OpenSimulator.org")] [assembly : AssemblyProduct("SimpleApp")] -[assembly : AssemblyCopyright("Copyright © Playahead AB 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs index a25d027..6b1f291 100644 --- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs +++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs @@ -50,7 +50,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples { /*if (args[0].ToLower() == "lslexport") { - string sequence = ""; + string sequence = String.Empty; foreach (KeyValuePair obj in script.world.Objects) { @@ -82,13 +82,13 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples LLVector3 scale = prim.Scale; LLVector3 rootPos = prim.WorldPos; - string setPrimParams = ""; + string setPrimParams = String.Empty; setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n"; return setPrimParams; */ - return ""; + return System.String.Empty; } } } \ No newline at end of file diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs index b152df2..3e5ae5a 100644 --- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs +++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/ClassRecord.cs @@ -237,7 +237,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM public class PoolUtf8 : PoolItem { - public string Value = ""; + public string Value = String.Empty; public void readValue(byte[] data, ref int pointer, int length) { @@ -274,7 +274,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM public class PoolClass : PoolItem { - //public string name = ""; + //public string name = String.Empty; public ushort namePointer = 0; private ClassRecord parent; public PoolUtf8 Name; @@ -384,7 +384,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM { public ushort AccessFlags = 0; public ushort NameIndex = 0; - public string Name = ""; + public string Name = String.Empty; public ushort DescriptorIndex = 0; public ushort AttributeCount = 0; public List Attributes = new List(); @@ -436,7 +436,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM public class MethodAttribute { public ushort NameIndex = 0; - public string Name = ""; + public string Name = String.Empty; public Int32 Length = 0; //for now only support code attribute public ushort MaxStack = 0; @@ -502,7 +502,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM public class SubAttribute { public ushort NameIndex = 0; - public string Name = ""; + public string Name = String.Empty; public Int32 Length = 0; public byte[] Data; private ClassRecord parent; @@ -546,7 +546,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM { public ushort AccessFlags = 0; public ushort NameIndex = 0; - public string Name = ""; + public string Name = String.Empty; public ushort DescriptorIndex = 0; public ushort AttributeCount = 0; public List Attributes = new List(); @@ -605,7 +605,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM public class FieldAttribute { public ushort NameIndex = 0; - public string Name = ""; + public string Name = String.Empty; public Int32 Length = 0; public byte[] Data; private ClassRecord parent; diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs index fb8a16e..59f4c0e 100644 --- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs +++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs @@ -46,8 +46,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM string typ = ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]). mNameType.Type.Value; - string typeparam = ""; - string typereturn = ""; + string typeparam = System.String.Empty; + string typereturn = System.String.Empty; int firstbrak = 0; int secondbrak = 0; firstbrak = typ.LastIndexOf('('); diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index a88299e..082021f 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs @@ -976,7 +976,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin public class BulletXCharacter : BulletXActor { public BulletXCharacter(BulletXScene parent_scene, PhysicsVector pos) - : this("", parent_scene, pos) + : this(String.Empty, parent_scene, pos) { } diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs index 809f3d5..4532bda 100644 --- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs +++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs @@ -53,7 +53,7 @@ namespace OpenSim.Region.Physics.Meshing public override String ToString() { - String result = ""; + String result = String.Empty; foreach (Vertex v in vertices) { result += "b:" + v.ToString() + "\n"; diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index b824cbe..bfdb90f 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs @@ -83,7 +83,7 @@ namespace OpenSim.Region.Physics.OdePlugin private bool m_alwaysRun = false; private bool m_hackSentFall = false; private bool m_hackSentFly = false; - private string m_name = ""; + private string m_name = String.Empty; private bool[] m_colliderarr = new bool[11]; private bool[] m_colliderGroundarr = new bool[11]; diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs index 1805e38..df28d7d 100644 --- a/OpenSim/Region/ScriptEngine/Common/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs @@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Common //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); - //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \"" + EventName + "\""); + //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \String.Empty + EventName + "\String.Empty); if (Events.ContainsKey(EventName) == false) { @@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (ev == null) // No event by that name! { - //Console.WriteLine("ScriptEngine Can not find any event named: \"" + EventName + "\""); + //Console.WriteLine("ScriptEngine Can not find any event named: \String.Empty + EventName + "\String.Empty); return; } diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs index 33e5c68..5149f3a 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs @@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Common public LSL_BuiltIn_Commands_Interface m_LSL_Functions; - private string _Source = ""; + private string _Source = String.Empty; public string Source { get diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 4cceb5f..1400617 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -297,7 +297,7 @@ namespace OpenSim.Region.ScriptEngine.Common public int llListen(int channelID, string name, string ID, string msg) { - if (ID == "") + if (ID == String.Empty) { ID = LLUUID.Zero.ToString(); } @@ -338,19 +338,19 @@ namespace OpenSim.Region.ScriptEngine.Common public string llDetectedName(int number) { NotImplemented("llDetectedName"); - return ""; + return String.Empty; } public string llDetectedKey(int number) { NotImplemented("llDetectedKey"); - return ""; + return String.Empty; } public string llDetectedOwner(int number) { NotImplemented("llDetectedOwner"); - return ""; + return String.Empty; } public int llDetectedType(int number) @@ -693,7 +693,7 @@ namespace OpenSim.Region.ScriptEngine.Common return texface.TextureID.ToString(); } NotImplemented("llGetTexture"); - return ""; + return String.Empty; } public void llSetPos(LSL_Types.Vector3 pos) @@ -1175,7 +1175,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetPermissionsKey() { NotImplemented("llGetPermissionsKey"); - return ""; + return String.Empty; } public int llGetPermissions() @@ -1336,7 +1336,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetInventoryName(int type, int number) { NotImplemented("llGetInventoryName"); - return ""; + return String.Empty; } public void llSetScriptState(string name, int run) @@ -1378,13 +1378,13 @@ namespace OpenSim.Region.ScriptEngine.Common public string llRequestAgentData(string id, int data) { NotImplemented("llRequestAgentData"); - return ""; + return String.Empty; } public string llRequestInventoryData(string name) { NotImplemented("llRequestInventoryData"); - return ""; + return String.Empty; } public void llSetDamage(double damage) @@ -1473,7 +1473,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetAnimation(string id) { NotImplemented("llGetAnimation"); - return ""; + return String.Empty; } public void llResetScript() @@ -1495,7 +1495,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetScriptName() { - return ""; + return String.Empty; } public int llGetNumberOfSides() @@ -1534,7 +1534,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetInventoryKey(string name) { - return ""; + return String.Empty; } public void llAllowInventoryDrop(int add) @@ -1592,7 +1592,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetOwnerKey(string id) { NotImplemented("llGetOwnerKey"); - return ""; + return String.Empty; } public LSL_Types.Vector3 llGetCenterOfMass() @@ -1610,14 +1610,14 @@ namespace OpenSim.Region.ScriptEngine.Common // s = 1; //int c = 0; //LSL_Types.list chunk = new LSL_Types.list(); - //string chunkString = ""; + //string chunkString = String.Empty; //foreach (string element in src) //{ // c++; // if (c > s) // { // sorted.Add(chunkString, chunk); - // chunkString = ""; + // chunkString = String.Empty; // chunk = new LSL_Types.list(); // c = 0; // } @@ -1693,7 +1693,7 @@ namespace OpenSim.Region.ScriptEngine.Common } if (index >= src.Length) { - return ""; + return String.Empty; } return src.Data[index].ToString(); } @@ -1814,7 +1814,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llList2CSV(LSL_Types.list src) { - string ret = ""; + string ret = String.Empty; foreach (object o in src.Data) { ret = ret + o.ToString() + ","; @@ -1968,7 +1968,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llKey2Name(string id) { NotImplemented("llKey2Name"); - return ""; + return String.Empty; } public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) @@ -2006,7 +2006,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetNotecardLine(string name, int line) { NotImplemented("llGetNotecardLine"); - return ""; + return String.Empty; } public LSL_Types.Vector3 llGetAgentSize(string id) @@ -2257,7 +2257,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (AVID != LLUUID.Zero) return AVID.ToString(); else - return ""; + return String.Empty; } public void llAddToLandPassList(string avatar, double hours) @@ -2289,9 +2289,9 @@ namespace OpenSim.Region.ScriptEngine.Common { if (src.Length == 0) { - return ""; + return String.Empty; } - string ret = ""; + string ret = String.Empty; foreach (object o in src.Data) { ret = ret + o.ToString() + seperator; @@ -2352,7 +2352,7 @@ namespace OpenSim.Region.ScriptEngine.Common if (xmlrpcMod.IsEnabled()) { LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID); - object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, "" }; + object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), String.Empty, 0, String.Empty }; m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj); } } @@ -2360,7 +2360,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llSendRemoteData(string channel, string dest, int idata, string sdata) { NotImplemented("llSendRemoteData"); - return ""; + return String.Empty; } public void llRemoteDataReply(string channel, string message_id, string sdata, int idata) @@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetNumberOfNotecardLines(string name) { NotImplemented("llGetNumberOfNotecardLines"); - return ""; + return String.Empty; } public LSL_Types.list llGetBoundingBox(string obj) @@ -2600,7 +2600,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llIntegerToBase64(int number) { NotImplemented("llIntegerToBase64"); - return ""; + return String.Empty; } public int llBase64ToInteger(string str) @@ -2660,7 +2660,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llGetInventoryCreator(string item) { NotImplemented("llGetInventoryCreator"); - return ""; + return String.Empty; } public void llOwnerSay(string msg) @@ -2828,7 +2828,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string llXorBase64StringsCorrect(string str1, string str2) { - string ret = ""; + string ret = String.Empty; string src1 = llBase64ToString(str1); string src2 = llBase64ToString(str2); int c = 0; @@ -3002,7 +3002,7 @@ namespace OpenSim.Region.ScriptEngine.Common public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer) { - if (dynamicID == "") + if (dynamicID == String.Empty) { IDynamicTextureManager textureManager = World.RequestModuleInterface(); LLUUID createdTexture = diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 0ae7a0a..e48f667 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -429,10 +429,10 @@ namespace OpenSim.Region.ScriptEngine.Common public override string ToString() { string output; - output = ""; + output = String.Empty; if (m_data.Length == 0) { - return ""; + return String.Empty; } foreach (object o in m_data) { diff --git a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs index 48cf45a..1572a51 100644 --- a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Common/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.Region.ScriptEngine.Common")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 6df8343..0a8f7ea 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs @@ -148,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // Handled by long commands public void timer(uint localID, LLUUID itemID) { - //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, ""); + //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, String.Empty); } public void listen(uint localID, LLUUID itemID) diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs index 8081e2c..af91027 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs @@ -323,7 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // Do we have any scripts in this object at all? If not, return if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) { - //Console.WriteLine("Event \"" + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); + //Console.WriteLine("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); return; } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs index 635c32a..7271d72 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs @@ -259,7 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase //Deliver data to prim's remote_data handler object[] resobj = new object[] { - 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), "", + 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), String.Empty, rInfo.GetIntValue(), rInfo.GetStrVal() }; diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 8f74620..784e849 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs @@ -161,7 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase catch (ThreadAbortException tae) { string a = tae.ToString(); - a = ""; + a = String.Empty; // Expected } } diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index 9cd22e2..2adc060 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs @@ -143,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // TODO: Return errors to user somehow if (results.Errors.Count > 0) { - string errtext = ""; + string errtext = String.Empty; foreach (CompilerError CompErr in results.Errors) { errtext += "Line number " + (CompErr.Line - 1) + diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 724d8f5..f3302ee 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs @@ -28,6 +28,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; +using System; namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL { @@ -58,7 +59,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL public string Convert(string Script) { quotes.Clear(); - string Return = ""; + string Return = System.String.Empty; Script = " \r\n" + Script; // @@ -72,13 +73,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // QUOTE REPLACEMENT // temporarily replace quotes so we can work our magic on the script without - // always considering if we are inside our outside ""'s - string _Script = ""; + // always considering if we are inside our outside String.Empty's + string _Script = System.String.Empty; string C; bool in_quote = false; bool quote_replaced = false; string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_"; - string quote = ""; + string quote = System.String.Empty; bool last_was_escape = false; int quote_replaced_count = 0; for (int p = 0; p < Script.Length; p++) @@ -97,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL } else { - if (quote == "") + if (quote == System.String.Empty) { // We didn't replace quote, probably because of empty string? _Script += quote_replacement_string + @@ -107,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL quotes.Add( quote_replacement_string + quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote); - quote = ""; + quote = System.String.Empty; } break; } @@ -151,10 +152,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // int ilevel = 0; int lastlevel = 0; - string ret = ""; - string cache = ""; + string ret = System.String.Empty; + string cache = System.String.Empty; bool in_state = false; - string current_statename = ""; + string current_statename = System.String.Empty; for (int p = 0; p < Script.Length; p++) { C = Script.Substring(p, 1); @@ -191,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); } ret += cache; - cache = ""; + cache = String.Empty; } if (ilevel == 0 && lastlevel == 1) { @@ -199,7 +200,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL if (in_state == true) { cache = cache.Remove(cache.Length - 1, 1); - //cache = Regex.Replace(cache, "}$", "", RegexOptions.Multiline | RegexOptions.Singleline); + //cache = Regex.Replace(cache, "}$", String.Empty, RegexOptions.Multiline | RegexOptions.Singleline); //Replace function names // void dataserver(key query_id, string data) { @@ -213,9 +214,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL } ret += cache; - cache = ""; + cache = String.Empty; in_state = true; - current_statename = ""; + current_statename = String.Empty; } break; @@ -223,10 +224,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL lastlevel = ilevel; } ret += cache; - cache = ""; + cache = String.Empty; Script = ret; - ret = ""; + ret = String.Empty; foreach (string key in dataTypes.Keys) @@ -287,7 +288,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // Add namespace, class name and inheritance - Return = "" + + Return = String.Empty + "using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;"; //"using System; " + //"using System.Collections.Generic; " + @@ -309,9 +310,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL //} - Return += "" + + Return += String.Empty + "namespace SecondLife { "; - Return += "" + + Return += String.Empty + //"[Serializable] " + "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { "; Return += @"public Script() { } "; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs index 00027ca..e484906 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/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.Region.ScriptEngine.DotNetEngine")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 0c28ac7..2bb40ee 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs @@ -64,7 +64,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine // We will initialize and start the script. // It will be up to the script itself to hook up the correct events. - string ScriptSource = ""; + string ScriptSource = String.Empty; SceneObjectPart m_host = World.GetSceneObjectPart(localID); diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs index 6dde3e5..c6fa4ce 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs @@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name); LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll"); LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode..."); - LSOEngine.LSO.Common.SendToLog(""); + LSOEngine.LSO.Common.SendToLog(String.Empty); // Create Assembly @@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO (asmName.Name, DLL_FileName); - //Common.SendToDebug("asmName.Name is still \"" + asmName.Name + "\""); + //Common.SendToDebug("asmName.Name is still \String.Empty + asmName.Name + "\String.Empty); // Create a Class (/Type) TypeBuilder typeBuilder = modBuilder.DefineType( "LSL_ScriptObject", @@ -152,7 +152,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //foreach (string s in ret) //{ - // Common.SendToLog(""); + // Common.SendToLog(String.Empty); // Common.SendToLog("*** Executing LSL Server Event: " + s); // //object test = type.GetMember(s); // //object runner = type.InvokeMember(s, BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.Instance, null, MyScript, args); diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs index d0cc0f9..efe8648 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs @@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO private string Read_String() { - string ret = ""; + string ret = String.Empty; byte reader = br_read(1)[0]; while (reader != 0x000) { diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs index 78014d6..763a759 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/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.Region.ScriptEngine.LSOEngine")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs index 56c422f..bd26ce4 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs @@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine // We will initialize and start the script. // It will be up to the script itself to hook up the correct events. - string ScriptSource = ""; + string ScriptSource = String.Empty; SceneObjectPart m_host = World.GetSceneObjectPart(localID); diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs index d78caf9..0462ba4 100644 --- a/OpenSim/Region/ScriptEngine/RemoteServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/RemoteServer/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.Region.ScriptEngine.RemoteServer")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs index ac9b741..d6c4675 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs @@ -798,7 +798,7 @@ namespace OpenSim.DataStore.MSSQL private SqlCommand 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) @@ -825,7 +825,7 @@ namespace OpenSim.DataStore.MSSQL 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/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs index 7608202..3d4dd3c 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/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.DataStore.NullStorage")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs index 3195140..33537fa 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs @@ -37,7 +37,7 @@ using System.Runtime.InteropServices; [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] [assembly : AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")] -[assembly : AssemblyCopyright("Copyright © 2007")] +[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs index e260dc0..8f4957c 100644 --- a/OpenSim/Tools/Export/OpenSimExport.cs +++ b/OpenSim/Tools/Export/OpenSimExport.cs @@ -54,7 +54,7 @@ namespace OpenSim.Tools.Export sman = new StorageManager( startup.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"), - startup.GetString("storage_connection_string", ""), + startup.GetString("storage_connection_string", String.Empty), false ); } -- cgit v1.1