From 188b5030f74cde47475fb82a91c3efbed79561ec Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 17 Sep 2016 19:46:40 +0100
Subject: restore sqlite fixes from commit 0e6874..that got lost

---
 OpenSim/Data/SQLite/SQLiteSimulationData.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Data/SQLite')

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
             createCol(land, "Name", typeof(String));
             createCol(land, "Desc", typeof(String));
             createCol(land, "OwnerUUID", typeof(String));
-            createCol(land, "IsGroupOwned", typeof(Boolean));
+            createCol(land, "IsGroupOwned", typeof(string));
             createCol(land, "Area", typeof(Int32));
             createCol(land, "AuctionID", typeof(Int32)); //Unemplemented
             createCol(land, "Category", typeof(Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory
@@ -1452,6 +1452,9 @@ namespace OpenSim.Data.SQLite
             createCol(land, "MediaLoop", typeof(Boolean));
             createCol(land, "ObscureMedia", typeof(Boolean));
             createCol(land, "ObscureMusic", typeof(Boolean));
+            createCol(land, "SeeAVs", typeof(Boolean));
+            createCol(land, "AnyAVSounds", typeof(Boolean));
+            createCol(land, "GroupAVSounds", typeof(Boolean));
 
             land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] };
 
@@ -1894,7 +1897,7 @@ namespace OpenSim.Data.SQLite
             newData.Name = (String)row["Name"];
             newData.Description = (String)row["Desc"];
             newData.OwnerID = (UUID)(String)row["OwnerUUID"];
-            newData.IsGroupOwned = (Boolean)row["IsGroupOwned"];
+            newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]);
             newData.Area = Convert.ToInt32(row["Area"]);
             newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
             newData.Category = (ParcelCategory)Convert.ToInt32(row["Category"]);
@@ -2310,7 +2313,7 @@ namespace OpenSim.Data.SQLite
             row["Name"] = land.Name;
             row["Desc"] = land.Description;
             row["OwnerUUID"] = land.OwnerID.ToString();
-            row["IsGroupOwned"] = land.IsGroupOwned;
+            row["IsGroupOwned"] = land.IsGroupOwned.ToString();
             row["Area"] = land.Area;
             row["AuctionID"] = land.AuctionID; //Unemplemented
             row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory
@@ -3004,6 +3007,10 @@ namespace OpenSim.Data.SQLite
             {
                 return DbType.Binary;
             }
+            else if (type == typeof(Boolean))
+            {
+                return DbType.Boolean;
+            }
             else
             {
                 return DbType.String;
-- 
cgit v1.1