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. --- .../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 +++++++++++++++++++++- 6 files changed, 65 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Communications') 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("")] -- cgit v1.1