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/Properties/AssemblyInfo.cs | 30 ++++++++++++++++++++++-
OpenSim/Framework/Data/RegionProfileData.cs | 28 ++++++++++-----------
OpenSim/Framework/Data/ReservationData.cs | 8 +++---
3 files changed, 47 insertions(+), 19 deletions(-)
(limited to 'OpenSim/Framework/Data')
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
--
cgit v1.1