aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL/MSSQLManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLManager.cs')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs38
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 535cf33..abbcddf 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37 37
@@ -220,7 +220,7 @@ namespace OpenSim.Data.MSSQL
220 { 220 {
221 return SqlDbType.Bit; 221 return SqlDbType.Bit;
222 } 222 }
223 if (type == typeof(LLUUID)) 223 if (type == typeof(UUID))
224 { 224 {
225 return SqlDbType.VarChar; 225 return SqlDbType.VarChar;
226 } 226 }
@@ -244,7 +244,7 @@ namespace OpenSim.Data.MSSQL
244 { 244 {
245 Type valueType = value.GetType(); 245 Type valueType = value.GetType();
246 246
247 if (valueType == typeof(LLUUID)) 247 if (valueType == typeof(UUID))
248 { 248 {
249 return value.ToString(); 249 return value.ToString();
250 } 250 }
@@ -335,7 +335,7 @@ namespace OpenSim.Data.MSSQL
335 // Region Main 335 // Region Main
336 regionprofile.regionHandle = Convert.ToUInt64(reader["regionHandle"]); 336 regionprofile.regionHandle = Convert.ToUInt64(reader["regionHandle"]);
337 regionprofile.regionName = (string)reader["regionName"]; 337 regionprofile.regionName = (string)reader["regionName"];
338 regionprofile.UUID = new LLUUID((string)reader["uuid"]); 338 regionprofile.UUID = new UUID((string)reader["uuid"]);
339 339
340 // Secrets 340 // Secrets
341 regionprofile.regionRecvKey = (string)reader["regionRecvKey"]; 341 regionprofile.regionRecvKey = (string)reader["regionRecvKey"];
@@ -372,16 +372,16 @@ namespace OpenSim.Data.MSSQL
372 regionprofile.regionUserURI = (string)reader["regionUserURI"]; 372 regionprofile.regionUserURI = (string)reader["regionUserURI"];
373 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"]; 373 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
374 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"]; 374 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
375 regionprofile.owner_uuid = new LLUUID((string) reader["owner_uuid"]); 375 regionprofile.owner_uuid = new UUID((string) reader["owner_uuid"]);
376 // World Map Addition 376 // World Map Addition
377 string tempRegionMap = reader["regionMapTexture"].ToString(); 377 string tempRegionMap = reader["regionMapTexture"].ToString();
378 if (tempRegionMap != String.Empty) 378 if (tempRegionMap != String.Empty)
379 { 379 {
380 regionprofile.regionMapTextureID = new LLUUID(tempRegionMap); 380 regionprofile.regionMapTextureID = new UUID(tempRegionMap);
381 } 381 }
382 else 382 else
383 { 383 {
384 regionprofile.regionMapTextureID = new LLUUID(); 384 regionprofile.regionMapTextureID = new UUID();
385 } 385 }
386 } 386 }
387 else 387 else
@@ -403,7 +403,7 @@ namespace OpenSim.Data.MSSQL
403 403
404 if (reader.Read()) 404 if (reader.Read())
405 { 405 {
406 retval.ID = new LLUUID((string)reader["UUID"]); 406 retval.ID = new UUID((string)reader["UUID"]);
407 retval.FirstName = (string)reader["username"]; 407 retval.FirstName = (string)reader["username"];
408 retval.SurName = (string)reader["lastname"]; 408 retval.SurName = (string)reader["lastname"];
409 409
@@ -411,11 +411,11 @@ namespace OpenSim.Data.MSSQL
411 retval.PasswordSalt = (string)reader["passwordSalt"]; 411 retval.PasswordSalt = (string)reader["passwordSalt"];
412 412
413 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); 413 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
414 retval.HomeLocation = new LLVector3( 414 retval.HomeLocation = new Vector3(
415 Convert.ToSingle(reader["homeLocationX"].ToString()), 415 Convert.ToSingle(reader["homeLocationX"].ToString()),
416 Convert.ToSingle(reader["homeLocationY"].ToString()), 416 Convert.ToSingle(reader["homeLocationY"].ToString()),
417 Convert.ToSingle(reader["homeLocationZ"].ToString())); 417 Convert.ToSingle(reader["homeLocationZ"].ToString()));
418 retval.HomeLookAt = new LLVector3( 418 retval.HomeLookAt = new Vector3(
419 Convert.ToSingle(reader["homeLookAtX"].ToString()), 419 Convert.ToSingle(reader["homeLookAtX"].ToString()),
420 Convert.ToSingle(reader["homeLookAtY"].ToString()), 420 Convert.ToSingle(reader["homeLookAtY"].ToString()),
421 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 421 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
@@ -432,9 +432,9 @@ namespace OpenSim.Data.MSSQL
432 retval.AboutText = (string)reader["profileAboutText"]; 432 retval.AboutText = (string)reader["profileAboutText"];
433 retval.FirstLifeAboutText = (string)reader["profileFirstText"]; 433 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
434 434
435 retval.Image = new LLUUID((string)reader["profileImage"]); 435 retval.Image = new UUID((string)reader["profileImage"]);
436 retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]); 436 retval.FirstLifeImage = new UUID((string)reader["profileFirstImage"]);
437 retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]); 437 retval.WebLoginKey = new UUID((string)reader["webLoginKey"]);
438 } 438 }
439 else 439 else
440 { 440 {
@@ -455,9 +455,9 @@ namespace OpenSim.Data.MSSQL
455 if (reader.Read()) 455 if (reader.Read())
456 { 456 {
457 // Agent IDs 457 // Agent IDs
458 retval.ProfileID = new LLUUID((string)reader["UUID"]); 458 retval.ProfileID = new UUID((string)reader["UUID"]);
459 retval.SessionID = new LLUUID((string)reader["sessionID"]); 459 retval.SessionID = new UUID((string)reader["sessionID"]);
460 retval.SecureSessionID = new LLUUID((string)reader["secureSessionID"]); 460 retval.SecureSessionID = new UUID((string)reader["secureSessionID"]);
461 461
462 // Agent Who? 462 // Agent Who?
463 retval.AgentIP = (string)reader["agentIP"]; 463 retval.AgentIP = (string)reader["agentIP"];
@@ -471,8 +471,8 @@ namespace OpenSim.Data.MSSQL
471 // Current position 471 // Current position
472 retval.Region = (string)reader["currentRegion"]; 472 retval.Region = (string)reader["currentRegion"];
473 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString()); 473 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
474 LLVector3 tmp_v; 474 Vector3 tmp_v;
475 LLVector3.TryParse((string)reader["currentPos"], out tmp_v); 475 Vector3.TryParse((string)reader["currentPos"], out tmp_v);
476 retval.Position = tmp_v; 476 retval.Position = tmp_v;
477 477
478 } 478 }
@@ -497,7 +497,7 @@ namespace OpenSim.Data.MSSQL
497 asset = new AssetBase(); 497 asset = new AssetBase();
498 asset.Data = (byte[])reader["data"]; 498 asset.Data = (byte[])reader["data"];
499 asset.Description = (string)reader["description"]; 499 asset.Description = (string)reader["description"];
500 asset.FullID = new LLUUID((string)reader["id"]); 500 asset.FullID = new UUID((string)reader["id"]);
501 asset.Local = Convert.ToBoolean(reader["local"]); // ((sbyte)reader["local"]) != 0 ? true : false; 501 asset.Local = Convert.ToBoolean(reader["local"]); // ((sbyte)reader["local"]) != 0 ? true : false;
502 asset.Name = (string)reader["name"]; 502 asset.Name = (string)reader["name"];
503 asset.Type = Convert.ToSByte(reader["assetType"]); 503 asset.Type = Convert.ToSByte(reader["assetType"]);