diff options
author | UbitUmarov | 2016-09-17 19:46:40 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-17 19:46:40 +0100 |
commit | 188b5030f74cde47475fb82a91c3efbed79561ec (patch) | |
tree | 209c8fe8b182bf9ff6e3a94dee56d0389858130d /OpenSim/Data/SQLite/SQLiteSimulationData.cs | |
parent | store all terrain in Variable2DGzip format (diff) | |
download | opensim-SC_OLD-188b5030f74cde47475fb82a91c3efbed79561ec.zip opensim-SC_OLD-188b5030f74cde47475fb82a91c3efbed79561ec.tar.gz opensim-SC_OLD-188b5030f74cde47475fb82a91c3efbed79561ec.tar.bz2 opensim-SC_OLD-188b5030f74cde47475fb82a91c3efbed79561ec.tar.xz |
restore sqlite fixes from commit 0e6874..that got lost
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 0d565f7..5b06f7f 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -1419,7 +1419,7 @@ namespace OpenSim.Data.SQLite | |||
1419 | createCol(land, "Name", typeof(String)); | 1419 | createCol(land, "Name", typeof(String)); |
1420 | createCol(land, "Desc", typeof(String)); | 1420 | createCol(land, "Desc", typeof(String)); |
1421 | createCol(land, "OwnerUUID", typeof(String)); | 1421 | createCol(land, "OwnerUUID", typeof(String)); |
1422 | createCol(land, "IsGroupOwned", typeof(Boolean)); | 1422 | createCol(land, "IsGroupOwned", typeof(string)); |
1423 | createCol(land, "Area", typeof(Int32)); | 1423 | createCol(land, "Area", typeof(Int32)); |
1424 | createCol(land, "AuctionID", typeof(Int32)); //Unemplemented | 1424 | createCol(land, "AuctionID", typeof(Int32)); //Unemplemented |
1425 | createCol(land, "Category", typeof(Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory | 1425 | createCol(land, "Category", typeof(Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory |
@@ -1452,6 +1452,9 @@ namespace OpenSim.Data.SQLite | |||
1452 | createCol(land, "MediaLoop", typeof(Boolean)); | 1452 | createCol(land, "MediaLoop", typeof(Boolean)); |
1453 | createCol(land, "ObscureMedia", typeof(Boolean)); | 1453 | createCol(land, "ObscureMedia", typeof(Boolean)); |
1454 | createCol(land, "ObscureMusic", typeof(Boolean)); | 1454 | createCol(land, "ObscureMusic", typeof(Boolean)); |
1455 | createCol(land, "SeeAVs", typeof(Boolean)); | ||
1456 | createCol(land, "AnyAVSounds", typeof(Boolean)); | ||
1457 | createCol(land, "GroupAVSounds", typeof(Boolean)); | ||
1455 | 1458 | ||
1456 | land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] }; | 1459 | land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] }; |
1457 | 1460 | ||
@@ -1894,7 +1897,7 @@ namespace OpenSim.Data.SQLite | |||
1894 | newData.Name = (String)row["Name"]; | 1897 | newData.Name = (String)row["Name"]; |
1895 | newData.Description = (String)row["Desc"]; | 1898 | newData.Description = (String)row["Desc"]; |
1896 | newData.OwnerID = (UUID)(String)row["OwnerUUID"]; | 1899 | newData.OwnerID = (UUID)(String)row["OwnerUUID"]; |
1897 | newData.IsGroupOwned = (Boolean)row["IsGroupOwned"]; | 1900 | newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]); |
1898 | newData.Area = Convert.ToInt32(row["Area"]); | 1901 | newData.Area = Convert.ToInt32(row["Area"]); |
1899 | newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented | 1902 | newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented |
1900 | newData.Category = (ParcelCategory)Convert.ToInt32(row["Category"]); | 1903 | newData.Category = (ParcelCategory)Convert.ToInt32(row["Category"]); |
@@ -2310,7 +2313,7 @@ namespace OpenSim.Data.SQLite | |||
2310 | row["Name"] = land.Name; | 2313 | row["Name"] = land.Name; |
2311 | row["Desc"] = land.Description; | 2314 | row["Desc"] = land.Description; |
2312 | row["OwnerUUID"] = land.OwnerID.ToString(); | 2315 | row["OwnerUUID"] = land.OwnerID.ToString(); |
2313 | row["IsGroupOwned"] = land.IsGroupOwned; | 2316 | row["IsGroupOwned"] = land.IsGroupOwned.ToString(); |
2314 | row["Area"] = land.Area; | 2317 | row["Area"] = land.Area; |
2315 | row["AuctionID"] = land.AuctionID; //Unemplemented | 2318 | row["AuctionID"] = land.AuctionID; //Unemplemented |
2316 | row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory | 2319 | row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory |
@@ -3004,6 +3007,10 @@ namespace OpenSim.Data.SQLite | |||
3004 | { | 3007 | { |
3005 | return DbType.Binary; | 3008 | return DbType.Binary; |
3006 | } | 3009 | } |
3010 | else if (type == typeof(Boolean)) | ||
3011 | { | ||
3012 | return DbType.Boolean; | ||
3013 | } | ||
3007 | else | 3014 | else |
3008 | { | 3015 | { |
3009 | return DbType.String; | 3016 | return DbType.String; |