From b25f9f322cdbcde7fd8c043137bf07992e5ef318 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 15 Jan 2008 02:09:55 +0000 Subject: * Mother of all commits: * Cleaned up copyright notices in AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them * Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate. --- OpenSim/Framework/Data.MSSQL/MSSQLManager.cs | 12 ++++----- .../Data.MSSQL/Properties/AssemblyInfo.cs | 30 +++++++++++++++++++++- 2 files changed, 35 insertions(+), 7 deletions(-) (limited to 'OpenSim/Framework/Data.MSSQL') 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("")] -- cgit v1.1