Minor cleanup.

7 files changed, 35 insertions, 51 deletions

diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 35a3635..0514a50 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Data.DB4o
     /// </summary>
     public class DB4oUserData : IUserData
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// The database manager
@@ -267,4 +267,4 @@ namespace OpenSim.Framework.Data.DB4o
             return "0.1";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
index 4d5e4c7..977b401 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
@@ -13,7 +13,7 @@
 *       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
+* 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
diff --git a/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs b/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs
index 0dfe671..5c11e3e 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLAssetData.cs
@@ -13,7 +13,7 @@
 *       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
+* 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
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 0ec976c..e8c42f3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -344,17 +344,14 @@ namespace OpenSim.Framework.Data.MySQL
                     retval.regionMapTextureID = LLUUID.Zero;
                 }
 
-                // Added by daTwitch
-                // part of an initial brutish effort to provide accurate information (as per the xml region spec)
-                // wrt the ownership of a given region
-                // the (very bad) assumption is that this value is being read and handled inconsistently or
-                // not at all. Current strategy is to put the code in place to support the validity of this information
-                // and to roll forward debugging any issues from that point
-                //
-                // this particular section of the mod attempts to supply a value from the region table to the caller of 'readSimRow()' 
-                // for the UUID of the region's owner (master avatar)
-                // 
-                //retval.owner_uuid = (string) reader["owner_uuid"];
+                // part of an initial brutish effort to provide accurate information (as per the xml region spec)
+                // wrt the ownership of a given region
+                // the (very bad) assumption is that this value is being read and handled inconsistently or
+                // not at all. Current strategy is to put the code in place to support the validity of this information
+                // and to roll forward debugging any issues from that point
+                //
+                // this particular section of the mod attempts to supply a value from the region table to the caller of 'readSimRow()' 
+                // for the UUID of the region's owner (master avatar)
                 try
                 {
                     retval.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
@@ -363,8 +360,6 @@ namespace OpenSim.Framework.Data.MySQL
                 {
                     retval.owner_uuid = LLUUID.Zero;
                 }
-        //
-                // end of daTwitch's mods to this file
             }
             else
             {
@@ -660,31 +655,27 @@ namespace OpenSim.Framework.Data.MySQL
             sql +=
                 "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
 
-            // Added by daTwitch
-            // part of an initial brutish effort to provide accurate information (as per the xml region spec)
-            // wrt the ownership of a given region
-            // the (very bad) assumption is that this value is being read and handled inconsistently or
-            // not at all. Current strategy is to put the code in place to support the validity of this information
-            // and to roll forward debugging any issues from that point
-            //
-            // this particular section of the mod attempts to implement the commit of a supplied value
-            // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql,
-            // as well as the related parameterization
+            // part of an initial brutish effort to provide accurate information (as per the xml region spec)
+            // wrt the ownership of a given region
+            // the (very bad) assumption is that this value is being read and handled inconsistently or
+            // not at all. Current strategy is to put the code in place to support the validity of this information
+            // and to roll forward debugging any issues from that point
+            //
+            // this particular section of the mod attempts to implement the commit of a supplied value
+            // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql,
+            // as well as the related parameterization
             sql +=
                 "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid) VALUES ";
-                // daTwitch
-
 
             sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
             sql +=
                 "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
             sql +=
                 "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid)";
-                // daTwitch
+
             if (GRID_ONLY_UPDATE_NECESSARY_DATA)
             {
                 sql += "ON DUPLICATE KEY UPDATE serverIP = ?serverIP, serverPort = ?serverPort, serverURI = ?serverURI, owner_uuid - ?owner_uuid;";
-                // daTwitch
             }
             else
             {
@@ -719,8 +710,7 @@ namespace OpenSim.Framework.Data.MySQL
             parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString();
             parameters["?serverHttpPort"] = regiondata.httpPort.ToString();
             parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
-            parameters["?owner_uuid"] = regiondata.owner_uuid.ToString();
-            // daTwitch
+            parameters["?owner_uuid"] = regiondata.owner_uuid.ToString();
 
             bool returnval = false;
 
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
index 23b4cb4..566880b 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -13,7 +13,7 @@
 *       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
+* 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
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index 0e1d2d3..760a3ba 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -13,7 +13,7 @@
 *       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
+* 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
diff --git a/OpenSim/Framework/Data/RegionProfileData.cs b/OpenSim/Framework/Data/RegionProfileData.cs
index 3dbe27f..fb53ac7 100644
--- a/OpenSim/Framework/Data/RegionProfileData.cs
+++ b/OpenSim/Framework/Data/RegionProfileData.cs
@@ -123,23 +123,17 @@ namespace OpenSim.Framework.Data
         /// </summary>
         public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");
 
-        // added by daTwitch
-        // part of an initial brutish effort to provide accurate information (as per the xml region spec)
-        // wrt the ownership of a given region
-        // the (very bad) assumption is that this value is being read and handled inconsistently or
-        // not at all. Current strategy is to put the code in place to support the validity of this information
-        // and to roll forward debugging any issues from that point
-        //
-        // this particular mod to the file provides support within the spec for RegionProfileData for the 
-        // owner_uuid for the region
-        //
-        /// <summary>
-        /// this particular mod to the file provides support within the spec for RegionProfileData for the 
-        /// owner_uuid for the region
-        /// </summary>
-        public LLUUID owner_uuid;
+        // part of an initial brutish effort to provide accurate information (as per the xml region spec)
+        // wrt the ownership of a given region
+        // the (very bad) assumption is that this value is being read and handled inconsistently or
+        // not at all. Current strategy is to put the code in place to support the validity of this information
+        // and to roll forward debugging any issues from that point
         //
-        // end of daTwitch mod to this file
+        /// <summary>
+        /// this particular mod to the file provides support within the spec for RegionProfileData for the 
+        /// owner_uuid for the region
+        /// </summary>
+        public LLUUID owner_uuid;
 
         /// <summary>
         /// Get Sim profile data from grid server when in grid mode