diff options
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 24 | ||||
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | 1 |
2 files changed, 13 insertions, 12 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index 2c08d2a..f999a59 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | |||
@@ -465,31 +465,31 @@ namespace OpenSim.Framework.Data.MySQL | |||
465 | DataTable land = new DataTable("land"); | 465 | DataTable land = new DataTable("land"); |
466 | createCol(land, "UUID", typeof(String)); | 466 | createCol(land, "UUID", typeof(String)); |
467 | createCol(land, "RegionUUID", typeof(String)); | 467 | createCol(land, "RegionUUID", typeof(String)); |
468 | createCol(land, "LocalLandID", typeof(UInt32)); | 468 | createCol(land, "LocalLandID", typeof(Int32)); |
469 | 469 | ||
470 | // Bitmap is a byte[512] | 470 | // Bitmap is a byte[512] |
471 | createCol(land, "Bitmap", typeof(Byte[])); | 471 | createCol(land, "Bitmap", typeof(Byte[])); |
472 | 472 | ||
473 | createCol(land, "Name", typeof(String)); | 473 | createCol(land, "Name", typeof(String)); |
474 | createCol(land, "Desc", typeof(String)); | 474 | createCol(land, "Description", typeof(String)); |
475 | createCol(land, "OwnerUUID", typeof(String)); | 475 | createCol(land, "OwnerUUID", typeof(String)); |
476 | createCol(land, "IsGroupOwned", typeof(Boolean)); | 476 | createCol(land, "IsGroupOwned", typeof(Int32)); |
477 | createCol(land, "Area", typeof(Int32)); | 477 | createCol(land, "Area", typeof(Int32)); |
478 | createCol(land, "AuctionID", typeof(Int32)); //Unemplemented | 478 | createCol(land, "AuctionID", typeof(Int32)); //Unemplemented |
479 | createCol(land, "Category", typeof(Int32)); //Enum libsecondlife.Parcel.ParcelCategory | 479 | createCol(land, "Category", typeof(Int32)); //Enum libsecondlife.Parcel.ParcelCategory |
480 | createCol(land, "ClaimDate", typeof(Int32)); | 480 | createCol(land, "ClaimDate", typeof(Int32)); |
481 | createCol(land, "ClaimPrice", typeof(Int32)); | 481 | createCol(land, "ClaimPrice", typeof(Int32)); |
482 | createCol(land, "GroupUUID", typeof(string)); | 482 | createCol(land, "GroupUUID", typeof(String)); |
483 | createCol(land, "SalePrice", typeof(Int32)); | 483 | createCol(land, "SalePrice", typeof(Int32)); |
484 | createCol(land, "LandStatus", typeof(Int32)); //Enum. libsecondlife.Parcel.ParcelStatus | 484 | createCol(land, "LandStatus", typeof(Int32)); //Enum. libsecondlife.Parcel.ParcelStatus |
485 | createCol(land, "LandFlags", typeof(UInt32)); | 485 | createCol(land, "LandFlags", typeof(Int32)); |
486 | createCol(land, "LandingType", typeof(Byte)); | 486 | createCol(land, "LandingType", typeof(Int32)); |
487 | createCol(land, "MediaAutoScale", typeof(Byte)); | 487 | createCol(land, "MediaAutoScale", typeof(Int32)); |
488 | createCol(land, "MediaTextureUUID", typeof(String)); | 488 | createCol(land, "MediaTextureUUID", typeof(String)); |
489 | createCol(land, "MediaURL", typeof(String)); | 489 | createCol(land, "MediaURL", typeof(String)); |
490 | createCol(land, "MusicURL", typeof(String)); | 490 | createCol(land, "MusicURL", typeof(String)); |
491 | createCol(land, "PassHours", typeof(Double)); | 491 | createCol(land, "PassHours", typeof(Double)); |
492 | createCol(land, "PassPrice", typeof(UInt32)); | 492 | createCol(land, "PassPrice", typeof(Int32)); |
493 | createCol(land, "SnapshotUUID", typeof(String)); | 493 | createCol(land, "SnapshotUUID", typeof(String)); |
494 | createCol(land, "UserLocationX", typeof(Double)); | 494 | createCol(land, "UserLocationX", typeof(Double)); |
495 | createCol(land, "UserLocationY", typeof(Double)); | 495 | createCol(land, "UserLocationY", typeof(Double)); |
@@ -508,7 +508,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
508 | DataTable landaccess = new DataTable("landaccesslist"); | 508 | DataTable landaccess = new DataTable("landaccesslist"); |
509 | createCol(landaccess, "LandUUID", typeof(String)); | 509 | createCol(landaccess, "LandUUID", typeof(String)); |
510 | createCol(landaccess, "AccessUUID", typeof(String)); | 510 | createCol(landaccess, "AccessUUID", typeof(String)); |
511 | createCol(landaccess, "Flags", typeof(UInt32)); | 511 | createCol(landaccess, "Flags", typeof(Int32)); |
512 | 512 | ||
513 | return landaccess; | 513 | return landaccess; |
514 | } | 514 | } |
@@ -633,7 +633,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
633 | newData.landBitmapByteArray = (Byte[])row["Bitmap"]; | 633 | newData.landBitmapByteArray = (Byte[])row["Bitmap"]; |
634 | 634 | ||
635 | newData.landName = (String)row["Name"]; | 635 | newData.landName = (String)row["Name"]; |
636 | newData.landDesc = (String)row["Desc"]; | 636 | newData.landDesc = (String)row["Description"]; |
637 | newData.ownerID = (String)row["OwnerUUID"]; | 637 | newData.ownerID = (String)row["OwnerUUID"]; |
638 | newData.isGroupOwned = (Boolean)row["IsGroupOwned"]; | 638 | newData.isGroupOwned = (Boolean)row["IsGroupOwned"]; |
639 | newData.area = Convert.ToInt32(row["Area"]); | 639 | newData.area = Convert.ToInt32(row["Area"]); |
@@ -740,7 +740,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
740 | row["Bitmap"] = land.landBitmapByteArray; | 740 | row["Bitmap"] = land.landBitmapByteArray; |
741 | 741 | ||
742 | row["Name"] = land.landName; | 742 | row["Name"] = land.landName; |
743 | row["Desc"] = land.landDesc; | 743 | row["Description"] = land.landDesc; |
744 | row["OwnerUUID"] = land.ownerID.ToString(); | 744 | row["OwnerUUID"] = land.ownerID.ToString(); |
745 | row["IsGroupOwned"] = land.isGroupOwned; | 745 | row["IsGroupOwned"] = land.isGroupOwned; |
746 | row["Area"] = land.area; | 746 | row["Area"] = land.area; |
@@ -1064,7 +1064,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
1064 | string createShapes = defineTable(createShapeTable()); | 1064 | string createShapes = defineTable(createShapeTable()); |
1065 | string createTerrain = defineTable(createTerrainTable()); | 1065 | string createTerrain = defineTable(createTerrainTable()); |
1066 | string createLand = defineTable(createLandTable()); | 1066 | string createLand = defineTable(createLandTable()); |
1067 | string createLandAccessList = defineTable(createLandTable()); | 1067 | string createLandAccessList = defineTable(createLandAccessListTable()); |
1068 | 1068 | ||
1069 | MySqlCommand pcmd = new MySqlCommand(createPrims, conn); | 1069 | MySqlCommand pcmd = new MySqlCommand(createPrims, conn); |
1070 | MySqlCommand scmd = new MySqlCommand(createShapes, conn); | 1070 | MySqlCommand scmd = new MySqlCommand(createShapes, conn); |
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs index 3aad88e..00b8924 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | |||
@@ -515,6 +515,7 @@ namespace OpenSim.DataStore.MSSQL | |||
515 | return prim; | 515 | return prim; |
516 | } | 516 | } |
517 | 517 | ||
518 | |||
518 | private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) | 519 | private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) |
519 | { | 520 | { |
520 | row["UUID"] = prim.UUID; | 521 | row["UUID"] = prim.UUID; |