aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-03 12:11:38 +0000
committerMelanie Thielker2008-10-03 12:11:38 +0000
commitec47a1bff2f8bf18be308a059ca8aaa193c9f540 (patch)
tree59342254518d8e1a4ea46c98bba49bc75a58b367 /OpenSim/Data
parentMantis #1360 (diff)
downloadopensim-SC_OLD-ec47a1bff2f8bf18be308a059ca8aaa193c9f540.zip
opensim-SC_OLD-ec47a1bff2f8bf18be308a059ca8aaa193c9f540.tar.gz
opensim-SC_OLD-ec47a1bff2f8bf18be308a059ca8aaa193c9f540.tar.bz2
opensim-SC_OLD-ec47a1bff2f8bf18be308a059ca8aaa193c9f540.tar.xz
Add database persistence for material setting
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs5
-rw-r--r--OpenSim/Data/MySQL/Resources/019_RegionStore.sql6
-rw-r--r--OpenSim/Data/SQLite/Resources/012_RegionStore.sql5
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs6
4 files changed, 22 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 0e8ca68..521490c 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -944,6 +944,7 @@ namespace OpenSim.Data.MySQL
944 createCol(prims, "SaleType", typeof (Int16)); 944 createCol(prims, "SaleType", typeof (Int16));
945 945
946 createCol(prims, "ClickAction", typeof (Byte)); 946 createCol(prims, "ClickAction", typeof (Byte));
947 createCol(prims, "Material", typeof (Byte));
947 948
948 // Add in contraints 949 // Add in contraints
949 prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]}; 950 prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]};
@@ -1228,6 +1229,8 @@ namespace OpenSim.Data.MySQL
1228 prim.SalePrice = Convert.ToInt32(row["SalePrice"]); 1229 prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
1229 prim.ObjectSaleType = Convert.ToByte(row["SaleType"]); 1230 prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
1230 1231
1232 prim.Material = Convert.ToByte(row["Material"]);
1233
1231 if (!row.IsNull("ClickAction")) 1234 if (!row.IsNull("ClickAction"))
1232 prim.ClickAction = Convert.ToByte(row["ClickAction"]); 1235 prim.ClickAction = Convert.ToByte(row["ClickAction"]);
1233 1236
@@ -1540,6 +1543,8 @@ namespace OpenSim.Data.MySQL
1540 1543
1541 byte clickAction = prim.ClickAction; 1544 byte clickAction = prim.ClickAction;
1542 row["ClickAction"] = clickAction; 1545 row["ClickAction"] = clickAction;
1546
1547 row["Material"] = prim.Material;
1543 } 1548 }
1544 1549
1545 /// <summary> 1550 /// <summary>
diff --git a/OpenSim/Data/MySQL/Resources/019_RegionStore.sql b/OpenSim/Data/MySQL/Resources/019_RegionStore.sql
new file mode 100644
index 0000000..4c14f2a
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/019_RegionStore.sql
@@ -0,0 +1,6 @@
1begin;
2
3ALTER TABLE prims ADD COLUMN Material tinyint NOT NULL default 3;
4
5commit;
6
diff --git a/OpenSim/Data/SQLite/Resources/012_RegionStore.sql b/OpenSim/Data/SQLite/Resources/012_RegionStore.sql
new file mode 100644
index 0000000..d952b78
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/012_RegionStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3ALTER TABLE prims ADD COLUMN Material INTEGER NOT NULL default 3;
4
5COMMIT;
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index bc64ba0..c6cd08f 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -859,6 +859,8 @@ namespace OpenSim.Data.SQLite
859 // click action 859 // click action
860 createCol(prims, "ClickAction", typeof (Byte)); 860 createCol(prims, "ClickAction", typeof (Byte));
861 861
862 createCol(prims, "Material", typeof(Int32));
863
862 // Add in contraints 864 // Add in contraints
863 prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]}; 865 prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]};
864 866
@@ -1213,6 +1215,8 @@ namespace OpenSim.Data.SQLite
1213 1215
1214 prim.SalePrice = Convert.ToInt32(row["SalePrice"]); 1216 prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
1215 prim.ObjectSaleType = Convert.ToByte(row["SaleType"]); 1217 prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
1218
1219 prim.Material = Convert.ToByte(row["Material"]);
1216 return prim; 1220 return prim;
1217 } 1221 }
1218 1222
@@ -1529,6 +1533,8 @@ namespace OpenSim.Data.SQLite
1529 1533
1530 // click action 1534 // click action
1531 row["ClickAction"] = prim.ClickAction; 1535 row["ClickAction"] = prim.ClickAction;
1536
1537 row["SalePrice"] = prim.SalePrice;
1532 } 1538 }
1533 1539
1534 /// <summary> 1540 /// <summary>