aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/Migration.cs46
-rw-r--r--OpenSim/Data/UserDataBase.cs4
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
74 74
75 private string _type; 75 private string _type;
76 private DbConnection _conn; 76 private DbConnection _conn;
77 private string _subtype; 77 // private string _subtype;
78 private Assembly _assem; 78 private Assembly _assem;
79 private Regex _match; 79 private Regex _match;
80 80
81 private static readonly string _migrations_create = "create table migrations(name varchar(100), version int)"; 81 private static readonly string _migrations_create = "create table migrations(name varchar(100), version int)";
82 private static readonly string _migrations_init = "insert into migrations values('migrations', 1)"; 82 // private static readonly string _migrations_init = "insert into migrations values('migrations', 1)";
83 private static readonly string _migrations_find = "select version from migrations where name='migrations'"; 83 // private static readonly string _migrations_find = "select version from migrations where name='migrations'";
84 84
85 public Migration(DbConnection conn, Assembly assem, string type) 85 public Migration(DbConnection conn, Assembly assem, string type)
86 { 86 {
@@ -150,23 +150,23 @@ namespace OpenSim.Data
150 } 150 }
151 } 151 }
152 152
153 private int MaxVersion() 153 // private int MaxVersion()
154 { 154 // {
155 int max = 0; 155 // int max = 0;
156 string[] names = _assem.GetManifestResourceNames(); 156 // string[] names = _assem.GetManifestResourceNames();
157 157
158 foreach (string s in names) 158 // foreach (string s in names)
159 { 159 // {
160 Match m = _match.Match(s); 160 // Match m = _match.Match(s);
161 if (m.Success) 161 // if (m.Success)
162 { 162 // {
163 int MigrationVersion = int.Parse(m.Groups[1].ToString()); 163 // int MigrationVersion = int.Parse(m.Groups[1].ToString());
164 if (MigrationVersion > max) 164 // if (MigrationVersion > max)
165 max = MigrationVersion; 165 // max = MigrationVersion;
166 } 166 // }
167 } 167 // }
168 return max; 168 // return max;
169 } 169 // }
170 170
171 public int Version 171 public int Version
172 { 172 {
@@ -222,10 +222,10 @@ namespace OpenSim.Data
222 cmd.ExecuteNonQuery(); 222 cmd.ExecuteNonQuery();
223 } 223 }
224 224
225 private SortedList<int, string> GetAllMigrations() 225 // private SortedList<int, string> GetAllMigrations()
226 { 226 // {
227 return GetMigrationsAfter(0); 227 // return GetMigrationsAfter(0);
228 } 228 // }
229 229
230 private SortedList<int, string> GetMigrationsAfter(int after) 230 private SortedList<int, string> GetMigrationsAfter(int after)
231 { 231 {
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
35{ 35{
36 public abstract class UserDataBase : IUserData 36 public abstract class UserDataBase : IUserData
37 { 37 {
38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 38 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 39
40 private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>(); 40 // private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>();
41 41
42 public abstract UserProfileData GetUserByUUID(LLUUID user); 42 public abstract UserProfileData GetUserByUUID(LLUUID user);
43 public abstract UserProfileData GetUserByName(string fname, string lname); 43 public abstract UserProfileData GetUserByName(string fname, string lname);