dr scofield's warning safari:

* commented out [Obsolete(....)] attributes where no replacement feature
  was available: if we want to attribute code that we think needs to be 
  reworked, we should define a new attribute and use that instead 
  (together with a little tool to retrieve all the attributed code then)
* commenting out unused variables

2 files changed, 25 insertions, 25 deletions

diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 70c7a46..6857c2c 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -74,13 +74,13 @@ namespace OpenSim.Data
 
         private string _type;
         private DbConnection _conn;
-        private string _subtype;
+        // private string _subtype;
         private Assembly _assem;
         private Regex _match;
         
         private static readonly string _migrations_create = "create table migrations(name varchar(100), version int)";
-        private static readonly string _migrations_init = "insert into migrations values('migrations', 1)";
-        private static readonly string _migrations_find = "select version from migrations where name='migrations'";
+        // private static readonly string _migrations_init = "insert into migrations values('migrations', 1)";
+        // private static readonly string _migrations_find = "select version from migrations where name='migrations'";
         
         public Migration(DbConnection conn, Assembly assem, string type)
         {
@@ -150,23 +150,23 @@ namespace OpenSim.Data
             }
         }
 
-        private int MaxVersion()
-        {
-            int max = 0;
-            string[] names = _assem.GetManifestResourceNames();
+        // private int MaxVersion()
+        // {
+        //     int max = 0;
+        //     string[] names = _assem.GetManifestResourceNames();
 
-            foreach (string s in names)
-            {
-                Match m = _match.Match(s);
-                if (m.Success) 
-                {
-                    int MigrationVersion = int.Parse(m.Groups[1].ToString());
-                    if (MigrationVersion > max)
-                        max = MigrationVersion;
-                }
-            }
-            return max;
-        }
+        //     foreach (string s in names)
+        //     {
+        //         Match m = _match.Match(s);
+        //         if (m.Success) 
+        //         {
+        //             int MigrationVersion = int.Parse(m.Groups[1].ToString());
+        //             if (MigrationVersion > max)
+        //                 max = MigrationVersion;
+        //         }
+        //     }
+        //     return max;
+        // }
 
         public int Version 
         {
@@ -222,10 +222,10 @@ namespace OpenSim.Data
             cmd.ExecuteNonQuery();
         }
         
-        private SortedList<int, string> GetAllMigrations()
-        {
-            return GetMigrationsAfter(0);
-        }
+        // private SortedList<int, string> GetAllMigrations()
+        // {
+        //     return GetMigrationsAfter(0);
+        // }
 
         private SortedList<int, string> GetMigrationsAfter(int after)
         {
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 384dd19..eb21aee 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -35,9 +35,9 @@ namespace OpenSim.Data
 {
     public abstract class UserDataBase : IUserData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>();
+        // private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>();
 
         public abstract UserProfileData GetUserByUUID(LLUUID user);
         public abstract UserProfileData GetUserByName(string fname, string lname);