aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs3
2 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index d7b3bbe..cd20c4e 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1354,7 +1354,7 @@ namespace OpenSim.Data.SQLite
1354 createCol(land, "Name", typeof(String)); 1354 createCol(land, "Name", typeof(String));
1355 createCol(land, "Desc", typeof(String)); 1355 createCol(land, "Desc", typeof(String));
1356 createCol(land, "OwnerUUID", typeof(String)); 1356 createCol(land, "OwnerUUID", typeof(String));
1357 createCol(land, "IsGroupOwned", typeof(Boolean)); 1357 createCol(land, "IsGroupOwned", typeof(String));
1358 createCol(land, "Area", typeof(Int32)); 1358 createCol(land, "Area", typeof(Int32));
1359 createCol(land, "AuctionID", typeof(Int32)); //Unemplemented 1359 createCol(land, "AuctionID", typeof(Int32)); //Unemplemented
1360 createCol(land, "Category", typeof(Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory 1360 createCol(land, "Category", typeof(Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory
@@ -1387,6 +1387,9 @@ namespace OpenSim.Data.SQLite
1387 createCol(land, "MediaLoop", typeof(Boolean)); 1387 createCol(land, "MediaLoop", typeof(Boolean));
1388 createCol(land, "ObscureMedia", typeof(Boolean)); 1388 createCol(land, "ObscureMedia", typeof(Boolean));
1389 createCol(land, "ObscureMusic", typeof(Boolean)); 1389 createCol(land, "ObscureMusic", typeof(Boolean));
1390 createCol(land, "SeeAVs", typeof(Boolean));
1391 createCol(land, "AnyAVSounds", typeof(Boolean));
1392 createCol(land, "GroupAVSounds", typeof(Boolean));
1390 1393
1391 land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] }; 1394 land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] };
1392 1395
@@ -1829,7 +1832,7 @@ namespace OpenSim.Data.SQLite
1829 newData.Name = (String)row["Name"]; 1832 newData.Name = (String)row["Name"];
1830 newData.Description = (String)row["Desc"]; 1833 newData.Description = (String)row["Desc"];
1831 newData.OwnerID = (UUID)(String)row["OwnerUUID"]; 1834 newData.OwnerID = (UUID)(String)row["OwnerUUID"];
1832 newData.IsGroupOwned = (Boolean)row["IsGroupOwned"]; 1835 newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]);
1833 newData.Area = Convert.ToInt32(row["Area"]); 1836 newData.Area = Convert.ToInt32(row["Area"]);
1834 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented 1837 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
1835 newData.Category = (ParcelCategory)Convert.ToInt32(row["Category"]); 1838 newData.Category = (ParcelCategory)Convert.ToInt32(row["Category"]);
@@ -2245,7 +2248,7 @@ namespace OpenSim.Data.SQLite
2245 row["Name"] = land.Name; 2248 row["Name"] = land.Name;
2246 row["Desc"] = land.Description; 2249 row["Desc"] = land.Description;
2247 row["OwnerUUID"] = land.OwnerID.ToString(); 2250 row["OwnerUUID"] = land.OwnerID.ToString();
2248 row["IsGroupOwned"] = land.IsGroupOwned; 2251 row["IsGroupOwned"] = land.IsGroupOwned.ToString();
2249 row["Area"] = land.Area; 2252 row["Area"] = land.Area;
2250 row["AuctionID"] = land.AuctionID; //Unemplemented 2253 row["AuctionID"] = land.AuctionID; //Unemplemented
2251 row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory 2254 row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory
@@ -2939,6 +2942,9 @@ namespace OpenSim.Data.SQLite
2939 { 2942 {
2940 return DbType.Binary; 2943 return DbType.Binary;
2941 } 2944 }
2945 else if (type == typeof(Boolean)) {
2946 return DbType.Boolean;
2947 }
2942 else 2948 else
2943 { 2949 {
2944 return DbType.String; 2950 return DbType.String;
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 4324ddc..68c9c97 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1435,6 +1435,9 @@ namespace OpenSim.Region.CoreModules.World.Land
1435 land.LandData.IsGroupOwned = false; 1435 land.LandData.IsGroupOwned = false;
1436 land.LandData.SalePrice = 0; 1436 land.LandData.SalePrice = 0;
1437 land.LandData.AuthBuyerID = UUID.Zero; 1437 land.LandData.AuthBuyerID = UUID.Zero;
1438 land.LandData.SeeAVs = true;
1439 land.LandData.AnyAVSounds = true;
1440 land.LandData.GroupAVSounds = true;
1438 land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory); 1441 land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
1439 m_scene.ForEachClient(SendParcelOverlay); 1442 m_scene.ForEachClient(SendParcelOverlay);
1440 land.SendLandUpdateToClient(true, remote_client); 1443 land.SendLandUpdateToClient(true, remote_client);