aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MySQL
diff options
context:
space:
mode:
authorlbsa712007-07-03 14:37:29 +0000
committerlbsa712007-07-03 14:37:29 +0000
commit9b6b6d05d45cf0f754a0b26bf6240ef50be66563 (patch)
tree8d72120aac2184c5ed4c5ab5f6b673ef496a0803 /OpenSim/Framework/Data.MySQL
parent* Completed conceptual LlsdMethod - everything resides in SimpleApp pending g... (diff)
downloadopensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.zip
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.gz
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.bz2
opensim-SC_OLD-9b6b6d05d45cf0f754a0b26bf6240ef50be66563.tar.xz
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Framework/Data.MySQL')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLGridData.cs30
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs22
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs51
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs15
-rw-r--r--OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs2
6 files changed, 56 insertions, 66 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 43e3054..ef643d2 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -27,8 +27,10 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data;
31using System.Security.Cryptography;
30using System.Text; 32using System.Text;
31using OpenSim.Framework.Data; 33using libsecondlife;
32 34
33namespace OpenSim.Framework.Data.MySQL 35namespace OpenSim.Framework.Data.MySQL
34{ 36{
@@ -104,8 +106,8 @@ namespace OpenSim.Framework.Data.MySQL
104 param["?xmax"] = xmax.ToString(); 106 param["?xmax"] = xmax.ToString();
105 param["?ymax"] = ymax.ToString(); 107 param["?ymax"] = ymax.ToString();
106 108
107 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param); 109 IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
108 System.Data.IDataReader reader = result.ExecuteReader(); 110 IDataReader reader = result.ExecuteReader();
109 111
110 SimProfileData row; 112 SimProfileData row;
111 113
@@ -144,8 +146,8 @@ namespace OpenSim.Framework.Data.MySQL
144 Dictionary<string, string> param = new Dictionary<string, string>(); 146 Dictionary<string, string> param = new Dictionary<string, string>();
145 param["?handle"] = handle.ToString(); 147 param["?handle"] = handle.ToString();
146 148
147 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param); 149 IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
148 System.Data.IDataReader reader = result.ExecuteReader(); 150 IDataReader reader = result.ExecuteReader();
149 151
150 SimProfileData row = database.readSimRow(reader); 152 SimProfileData row = database.readSimRow(reader);
151 reader.Close(); 153 reader.Close();
@@ -167,7 +169,7 @@ namespace OpenSim.Framework.Data.MySQL
167 /// </summary> 169 /// </summary>
168 /// <param name="uuid">The region UUID</param> 170 /// <param name="uuid">The region UUID</param>
169 /// <returns>The sim profile</returns> 171 /// <returns>The sim profile</returns>
170 public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid) 172 public SimProfileData GetProfileByLLUUID(LLUUID uuid)
171 { 173 {
172 try 174 try
173 { 175 {
@@ -176,8 +178,8 @@ namespace OpenSim.Framework.Data.MySQL
176 Dictionary<string, string> param = new Dictionary<string, string>(); 178 Dictionary<string, string> param = new Dictionary<string, string>();
177 param["?uuid"] = uuid.ToStringHyphenated(); 179 param["?uuid"] = uuid.ToStringHyphenated();
178 180
179 System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param); 181 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
180 System.Data.IDataReader reader = result.ExecuteReader(); 182 IDataReader reader = result.ExecuteReader();
181 183
182 SimProfileData row = database.readSimRow(reader); 184 SimProfileData row = database.readSimRow(reader);
183 reader.Close(); 185 reader.Close();
@@ -221,7 +223,7 @@ namespace OpenSim.Framework.Data.MySQL
221 /// <param name="handle">The attempted regionHandle of the challenger</param> 223 /// <param name="handle">The attempted regionHandle of the challenger</param>
222 /// <param name="authkey">The secret</param> 224 /// <param name="authkey">The secret</param>
223 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 225 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
224 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey) 226 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
225 { 227 {
226 bool throwHissyFit = false; // Should be true by 1.0 228 bool throwHissyFit = false; // Should be true by 1.0
227 229
@@ -242,10 +244,10 @@ namespace OpenSim.Framework.Data.MySQL
242 /// <param name="authhash"></param> 244 /// <param name="authhash"></param>
243 /// <param name="challenge"></param> 245 /// <param name="challenge"></param>
244 /// <returns></returns> 246 /// <returns></returns>
245 public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge) 247 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
246 { 248 {
247 System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed(); 249 SHA512Managed HashProvider = new SHA512Managed();
248 System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding(); 250 ASCIIEncoding TextProvider = new ASCIIEncoding();
249 251
250 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 252 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge);
251 byte[] hash = HashProvider.ComputeHash(stream); 253 byte[] hash = HashProvider.ComputeHash(stream);
@@ -262,8 +264,8 @@ namespace OpenSim.Framework.Data.MySQL
262 Dictionary<string, string> param = new Dictionary<string, string>(); 264 Dictionary<string, string> param = new Dictionary<string, string>();
263 param["?x"] = x.ToString(); 265 param["?x"] = x.ToString();
264 param["?y"] = y.ToString(); 266 param["?y"] = y.ToString();
265 System.Data.IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param); 267 IDbCommand result = database.Query("SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y", param);
266 System.Data.IDataReader reader = result.ExecuteReader(); 268 IDataReader reader = result.ExecuteReader();
267 269
268 ReservationData row = database.readReservationRow(reader); 270 ReservationData row = database.readReservationRow(reader);
269 reader.Close(); 271 reader.Close();
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 434df1a..790759a 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -27,7 +27,7 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Data;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Framework.Data.MySQL 33namespace OpenSim.Framework.Data.MySQL
@@ -98,8 +98,8 @@ namespace OpenSim.Framework.Data.MySQL
98 Dictionary<string, string> param = new Dictionary<string, string>(); 98 Dictionary<string, string> param = new Dictionary<string, string>();
99 param["?uuid"] = folderID.ToStringHyphenated(); 99 param["?uuid"] = folderID.ToStringHyphenated();
100 100
101 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param); 101 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
102 System.Data.IDataReader reader = result.ExecuteReader(); 102 IDataReader reader = result.ExecuteReader();
103 103
104 List<InventoryItemBase> items = database.readInventoryItems(reader); 104 List<InventoryItemBase> items = database.readInventoryItems(reader);
105 105
@@ -132,8 +132,8 @@ namespace OpenSim.Framework.Data.MySQL
132 param["?uuid"] = user.ToStringHyphenated(); 132 param["?uuid"] = user.ToStringHyphenated();
133 param["?zero"] = LLUUID.Zero.ToStringHyphenated(); 133 param["?zero"] = LLUUID.Zero.ToStringHyphenated();
134 134
135 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param); 135 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
136 System.Data.IDataReader reader = result.ExecuteReader(); 136 IDataReader reader = result.ExecuteReader();
137 137
138 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 138 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
139 139
@@ -165,8 +165,8 @@ namespace OpenSim.Framework.Data.MySQL
165 Dictionary<string, string> param = new Dictionary<string, string>(); 165 Dictionary<string, string> param = new Dictionary<string, string>();
166 param["?uuid"] = parentID.ToStringHyphenated(); 166 param["?uuid"] = parentID.ToStringHyphenated();
167 167
168 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param); 168 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
169 System.Data.IDataReader reader = result.ExecuteReader(); 169 IDataReader reader = result.ExecuteReader();
170 170
171 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 171 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
172 172
@@ -198,8 +198,8 @@ namespace OpenSim.Framework.Data.MySQL
198 Dictionary<string, string> param = new Dictionary<string, string>(); 198 Dictionary<string, string> param = new Dictionary<string, string>();
199 param["?uuid"] = item.ToStringHyphenated(); 199 param["?uuid"] = item.ToStringHyphenated();
200 200
201 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param); 201 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
202 System.Data.IDataReader reader = result.ExecuteReader(); 202 IDataReader reader = result.ExecuteReader();
203 203
204 List<InventoryItemBase> items = database.readInventoryItems(reader); 204 List<InventoryItemBase> items = database.readInventoryItems(reader);
205 205
@@ -238,8 +238,8 @@ namespace OpenSim.Framework.Data.MySQL
238 Dictionary<string, string> param = new Dictionary<string, string>(); 238 Dictionary<string, string> param = new Dictionary<string, string>();
239 param["?uuid"] = folder.ToStringHyphenated(); 239 param["?uuid"] = folder.ToStringHyphenated();
240 240
241 System.Data.IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param); 241 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
242 System.Data.IDataReader reader = result.ExecuteReader(); 242 IDataReader reader = result.ExecuteReader();
243 243
244 List<InventoryFolderBase> items = database.readInventoryFolders(reader); 244 List<InventoryFolderBase> items = database.readInventoryFolders(reader);
245 245
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index 8265614..66f3399 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -26,8 +26,6 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework.Data.MySQL 30namespace OpenSim.Framework.Data.MySQL
33{ 31{
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index b2f398b..ab478ed 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -27,17 +27,10 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using System.Data; 30using System.Data;
32 31using libsecondlife;
33// MySQL Native
34using MySql;
35using MySql.Data;
36using MySql.Data.Types;
37using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
38 33
39using OpenSim.Framework.Data;
40
41namespace OpenSim.Framework.Data.MySQL 34namespace OpenSim.Framework.Data.MySQL
42{ 35{
43 /// <summary> 36 /// <summary>
@@ -71,7 +64,7 @@ namespace OpenSim.Framework.Data.MySQL
71 64
72 dbcon.Open(); 65 dbcon.Open();
73 66
74 System.Console.WriteLine("MySQL connection established"); 67 Console.WriteLine("MySQL connection established");
75 } 68 }
76 catch (Exception e) 69 catch (Exception e)
77 { 70 {
@@ -187,7 +180,7 @@ namespace OpenSim.Framework.Data.MySQL
187 // Region Main 180 // Region Main
188 retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString()); 181 retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());
189 retval.regionName = (string)reader["regionName"]; 182 retval.regionName = (string)reader["regionName"];
190 retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]); 183 retval.UUID = new LLUUID((string)reader["uuid"]);
191 184
192 // Secrets 185 // Secrets
193 retval.regionRecvKey = (string)reader["regionRecvKey"]; 186 retval.regionRecvKey = (string)reader["regionRecvKey"];
@@ -226,11 +219,11 @@ namespace OpenSim.Framework.Data.MySQL
226 string tempRegionMap = reader["regionMapTexture"].ToString(); 219 string tempRegionMap = reader["regionMapTexture"].ToString();
227 if (tempRegionMap != "") 220 if (tempRegionMap != "")
228 { 221 {
229 retval.regionMapTextureID = new libsecondlife.LLUUID(tempRegionMap); 222 retval.regionMapTextureID = new LLUUID(tempRegionMap);
230 } 223 }
231 else 224 else
232 { 225 {
233 retval.regionMapTextureID = new libsecondlife.LLUUID(); 226 retval.regionMapTextureID = new LLUUID();
234 } 227 }
235 } 228 }
236 else 229 else
@@ -259,7 +252,7 @@ namespace OpenSim.Framework.Data.MySQL
259 retval.reservationMinY = (int)reader["resYMin"]; 252 retval.reservationMinY = (int)reader["resYMin"];
260 retval.reservationName = (string)reader["resName"]; 253 retval.reservationName = (string)reader["resName"];
261 retval.status = (bool)reader["status"]; 254 retval.status = (bool)reader["status"];
262 retval.userUUID = new libsecondlife.LLUUID((string)reader["userUUID"]); 255 retval.userUUID = new LLUUID((string)reader["userUUID"]);
263 256
264 } 257 }
265 else 258 else
@@ -280,9 +273,9 @@ namespace OpenSim.Framework.Data.MySQL
280 if (reader.Read()) 273 if (reader.Read())
281 { 274 {
282 // Agent IDs 275 // Agent IDs
283 retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]); 276 retval.UUID = new LLUUID((string)reader["UUID"]);
284 retval.sessionID = new libsecondlife.LLUUID((string)reader["sessionID"]); 277 retval.sessionID = new LLUUID((string)reader["sessionID"]);
285 retval.secureSessionID = new libsecondlife.LLUUID((string)reader["secureSessionID"]); 278 retval.secureSessionID = new LLUUID((string)reader["secureSessionID"]);
286 279
287 // Agent Who? 280 // Agent Who?
288 retval.agentIP = (string)reader["agentIP"]; 281 retval.agentIP = (string)reader["agentIP"];
@@ -296,7 +289,7 @@ namespace OpenSim.Framework.Data.MySQL
296 // Current position 289 // Current position
297 retval.currentRegion = (string)reader["currentRegion"]; 290 retval.currentRegion = (string)reader["currentRegion"];
298 retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString()); 291 retval.currentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
299 libsecondlife.LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); 292 LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
300 } 293 }
301 else 294 else
302 { 295 {
@@ -316,7 +309,7 @@ namespace OpenSim.Framework.Data.MySQL
316 309
317 if (reader.Read()) 310 if (reader.Read())
318 { 311 {
319 retval.UUID = new libsecondlife.LLUUID((string)reader["UUID"]); 312 retval.UUID = new LLUUID((string)reader["UUID"]);
320 retval.username = (string)reader["username"]; 313 retval.username = (string)reader["username"];
321 retval.surname = (string)reader["lastname"]; 314 retval.surname = (string)reader["lastname"];
322 315
@@ -324,11 +317,11 @@ namespace OpenSim.Framework.Data.MySQL
324 retval.passwordSalt = (string)reader["passwordSalt"]; 317 retval.passwordSalt = (string)reader["passwordSalt"];
325 318
326 retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); 319 retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
327 retval.homeLocation = new libsecondlife.LLVector3( 320 retval.homeLocation = new LLVector3(
328 Convert.ToSingle(reader["homeLocationX"].ToString()), 321 Convert.ToSingle(reader["homeLocationX"].ToString()),
329 Convert.ToSingle(reader["homeLocationY"].ToString()), 322 Convert.ToSingle(reader["homeLocationY"].ToString()),
330 Convert.ToSingle(reader["homeLocationZ"].ToString())); 323 Convert.ToSingle(reader["homeLocationZ"].ToString()));
331 retval.homeLookAt = new libsecondlife.LLVector3( 324 retval.homeLookAt = new LLVector3(
332 Convert.ToSingle(reader["homeLookAtX"].ToString()), 325 Convert.ToSingle(reader["homeLookAtX"].ToString()),
333 Convert.ToSingle(reader["homeLookAtY"].ToString()), 326 Convert.ToSingle(reader["homeLookAtY"].ToString()),
334 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 327 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
@@ -345,8 +338,8 @@ namespace OpenSim.Framework.Data.MySQL
345 retval.profileAboutText = (string)reader["profileAboutText"]; 338 retval.profileAboutText = (string)reader["profileAboutText"];
346 retval.profileFirstText = (string)reader["profileFirstText"]; 339 retval.profileFirstText = (string)reader["profileFirstText"];
347 340
348 retval.profileImage = new libsecondlife.LLUUID((string)reader["profileImage"]); 341 retval.profileImage = new LLUUID((string)reader["profileImage"]);
349 retval.profileFirstImage = new libsecondlife.LLUUID((string)reader["profileFirstImage"]); 342 retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
350 343
351 } 344 }
352 else 345 else
@@ -371,9 +364,9 @@ namespace OpenSim.Framework.Data.MySQL
371 { 364 {
372 InventoryFolderBase folder = new InventoryFolderBase(); 365 InventoryFolderBase folder = new InventoryFolderBase();
373 366
374 folder.agentID = new libsecondlife.LLUUID((string)reader["agentID"]); 367 folder.agentID = new LLUUID((string)reader["agentID"]);
375 folder.parentID = new libsecondlife.LLUUID((string)reader["parentFolderID"]); 368 folder.parentID = new LLUUID((string)reader["parentFolderID"]);
376 folder.folderID = new libsecondlife.LLUUID((string)reader["folderID"]); 369 folder.folderID = new LLUUID((string)reader["folderID"]);
377 folder.name = (string)reader["folderName"]; 370 folder.name = (string)reader["folderName"];
378 371
379 rows.Add(folder); 372 rows.Add(folder);
@@ -402,14 +395,14 @@ namespace OpenSim.Framework.Data.MySQL
402 { 395 {
403 InventoryItemBase item = new InventoryItemBase(); 396 InventoryItemBase item = new InventoryItemBase();
404 397
405 item.assetID = new libsecondlife.LLUUID((string)reader["assetID"]); 398 item.assetID = new LLUUID((string)reader["assetID"]);
406 item.avatarID = new libsecondlife.LLUUID((string)reader["avatarID"]); 399 item.avatarID = new LLUUID((string)reader["avatarID"]);
407 item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString()); 400 item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());
408 item.inventoryDescription = (string)reader["inventoryDescription"]; 401 item.inventoryDescription = (string)reader["inventoryDescription"];
409 item.inventoryID = new libsecondlife.LLUUID((string)reader["inventoryID"]); 402 item.inventoryID = new LLUUID((string)reader["inventoryID"]);
410 item.inventoryName = (string)reader["inventoryName"]; 403 item.inventoryName = (string)reader["inventoryName"];
411 item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString()); 404 item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
412 item.parentFolderID = new libsecondlife.LLUUID((string)reader["parentFolderID"]); 405 item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
413 item.type = Convert.ToInt32(reader["type"].ToString()); 406 item.type = Convert.ToInt32(reader["type"].ToString());
414 407
415 rows.Add(item); 408 rows.Add(item);
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 0304452..c116536 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -27,8 +27,7 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Data;
31using OpenSim.Framework.Data;
32using libsecondlife; 31using libsecondlife;
33 32
34namespace OpenSim.Framework.Data.MySQL 33namespace OpenSim.Framework.Data.MySQL
@@ -87,8 +86,8 @@ namespace OpenSim.Framework.Data.MySQL
87 param["?first"] = user; 86 param["?first"] = user;
88 param["?second"] = last; 87 param["?second"] = last;
89 88
90 System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param); 89 IDbCommand result = database.Query("SELECT * FROM users WHERE username = ?first AND lastname = ?second", param);
91 System.Data.IDataReader reader = result.ExecuteReader(); 90 IDataReader reader = result.ExecuteReader();
92 91
93 UserProfileData row = database.readUserRow(reader); 92 UserProfileData row = database.readUserRow(reader);
94 93
@@ -120,8 +119,8 @@ namespace OpenSim.Framework.Data.MySQL
120 Dictionary<string, string> param = new Dictionary<string, string>(); 119 Dictionary<string, string> param = new Dictionary<string, string>();
121 param["?uuid"] = uuid.ToStringHyphenated(); 120 param["?uuid"] = uuid.ToStringHyphenated();
122 121
123 System.Data.IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param); 122 IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
124 System.Data.IDataReader reader = result.ExecuteReader(); 123 IDataReader reader = result.ExecuteReader();
125 124
126 UserProfileData row = database.readUserRow(reader); 125 UserProfileData row = database.readUserRow(reader);
127 126
@@ -175,8 +174,8 @@ namespace OpenSim.Framework.Data.MySQL
175 Dictionary<string, string> param = new Dictionary<string, string>(); 174 Dictionary<string, string> param = new Dictionary<string, string>();
176 param["?uuid"] = uuid.ToStringHyphenated(); 175 param["?uuid"] = uuid.ToStringHyphenated();
177 176
178 System.Data.IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param); 177 IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
179 System.Data.IDataReader reader = result.ExecuteReader(); 178 IDataReader reader = result.ExecuteReader();
180 179
181 UserAgentData row = database.readAgentRow(reader); 180 UserAgentData row = database.readAgentRow(reader);
182 181
diff --git a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index d67ccf6..52d6a54 100644
--- a/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following 3// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 4// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 5// associated with an assembly.