From ec47a1bff2f8bf18be308a059ca8aaa193c9f540 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 3 Oct 2008 12:11:38 +0000
Subject: [PATCH] Add database persistence for material setting

---
 OpenSim/Data/MySQL/MySQLRegionData.cs             | 5 +++++
 OpenSim/Data/MySQL/Resources/019_RegionStore.sql  | 6 ++++++
 OpenSim/Data/SQLite/Resources/012_RegionStore.sql | 5 +++++
 OpenSim/Data/SQLite/SQLiteRegionData.cs           | 6 ++++++
 4 files changed, 22 insertions(+)
 create mode 100644 OpenSim/Data/MySQL/Resources/019_RegionStore.sql
 create mode 100644 OpenSim/Data/SQLite/Resources/012_RegionStore.sql

diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 0e8ca68e29..521490c90f 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -944,6 +944,7 @@ namespace OpenSim.Data.MySQL
             createCol(prims, "SaleType", typeof (Int16));
 
             createCol(prims, "ClickAction", typeof (Byte));
+            createCol(prims, "Material", typeof (Byte));
 
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]};
@@ -1228,6 +1229,8 @@ namespace OpenSim.Data.MySQL
             prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
             prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
 
+            prim.Material = Convert.ToByte(row["Material"]);
+
             if (!row.IsNull("ClickAction"))
                 prim.ClickAction = Convert.ToByte(row["ClickAction"]);
 
@@ -1540,6 +1543,8 @@ namespace OpenSim.Data.MySQL
 
             byte clickAction = prim.ClickAction;
             row["ClickAction"] = clickAction;
+
+            row["Material"] = prim.Material;
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MySQL/Resources/019_RegionStore.sql b/OpenSim/Data/MySQL/Resources/019_RegionStore.sql
new file mode 100644
index 0000000000..4c14f2a5f4
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/019_RegionStore.sql
@@ -0,0 +1,6 @@
+begin;
+
+ALTER TABLE prims ADD COLUMN Material tinyint NOT NULL default 3;
+
+commit;
+
diff --git a/OpenSim/Data/SQLite/Resources/012_RegionStore.sql b/OpenSim/Data/SQLite/Resources/012_RegionStore.sql
new file mode 100644
index 0000000000..d952b78bd2
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/012_RegionStore.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE prims ADD COLUMN Material INTEGER NOT NULL default 3;
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index bc64ba068c..c6cd08ffb0 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -859,6 +859,8 @@ namespace OpenSim.Data.SQLite
             // click action
             createCol(prims, "ClickAction", typeof (Byte));
 
+            createCol(prims, "Material", typeof(Int32));
+
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]};
 
@@ -1213,6 +1215,8 @@ namespace OpenSim.Data.SQLite
 
             prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
             prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
+
+            prim.Material = Convert.ToByte(row["Material"]);
             return prim;
         }
 
@@ -1529,6 +1533,8 @@ namespace OpenSim.Data.SQLite
 
             // click action
             row["ClickAction"] = prim.ClickAction;
+
+            row["SalePrice"] = prim.SalePrice;
         }
 
         /// <summary>