* 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.

15 files changed, 192 insertions, 52 deletions

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<string, string> param = new Dictionary<string, string>();
-                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<string, string> param = new Dictionary<string, string>();
-                        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<string, string> param = new Dictionary<string, string>();
-                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<string, string> param = new Dictionary<string, string>();
-                        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
         /// <summary>
         /// The name of the region
         /// </summary>
-        public string regionName = "";
+        public string regionName = String.Empty;
 
         /// <summary>
         /// A 64-bit number combining map position into a (mostly) unique ID
@@ -65,10 +65,10 @@ namespace OpenSim.Framework.Data
         /// Authentication secrets
         /// </summary>
         /// <remarks>Not very secure, needs improvement.</remarks>
-        public string regionSendKey = "";
+        public string regionSendKey = String.Empty;
 
-        public string regionRecvKey = "";
-        public string regionSecret = "";
+        public string regionRecvKey = String.Empty;
+        public string regionSecret = String.Empty;
 
         /// <summary>
         /// Whether the region is online
@@ -78,14 +78,14 @@ namespace OpenSim.Framework.Data
         /// <summary>
         /// Information about the server that the region is currently hosted on
         /// </summary>
-        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;
 
         /// <summary>
         /// 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
         /// </summary>
         /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
-        public string regionDataURI = "";
+        public string regionDataURI = String.Empty;
 
         /// <summary>
         /// Region Asset Details
         /// </summary>
-        public string regionAssetURI = "";
+        public string regionAssetURI = String.Empty;
 
-        public string regionAssetSendKey = "";
-        public string regionAssetRecvKey = "";
+        public string regionAssetSendKey = String.Empty;
+        public string regionAssetRecvKey = String.Empty;
 
         /// <summary>
         /// Region Userserver Details
         /// </summary>
-        public string regionUserURI = "";
+        public string regionUserURI = String.Empty;
 
-        public string regionUserSendKey = "";
-        public string regionUserRecvKey = "";
+        public string regionUserSendKey = String.Empty;
+        public string regionUserRecvKey = String.Empty;
 
         /// <summary>
         /// 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