diff options
author | Sean Dague | 2008-10-03 12:36:54 +0000 |
---|---|---|
committer | Sean Dague | 2008-10-03 12:36:54 +0000 |
commit | 5f8e241e81620e48b59c0b08d6fb74133c0385bc (patch) | |
tree | bdc70595c2db74049a9033e240ce7ff95495bdac | |
parent | Add database persistence for material setting (diff) | |
download | opensim-SC-5f8e241e81620e48b59c0b08d6fb74133c0385bc.zip opensim-SC-5f8e241e81620e48b59c0b08d6fb74133c0385bc.tar.gz opensim-SC-5f8e241e81620e48b59c0b08d6fb74133c0385bc.tar.bz2 opensim-SC-5f8e241e81620e48b59c0b08d6fb74133c0385bc.tar.xz |
fix the sqlite break. There were two issue here:
1. type issues on column create in ado.net
2. not setting a field in the ado.net row translates into explicitely
setting it to null in sqlite land (because it can't read the defaults
stanzas out of the database)
Things should work again after this.
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index c6cd08f..c87d2e3 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -859,7 +859,7 @@ 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)); | 862 | createCol(prims, "Material", typeof(Byte)); |
863 | 863 | ||
864 | // Add in contraints | 864 | // Add in contraints |
865 | prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]}; | 865 | prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]}; |
@@ -1535,6 +1535,7 @@ namespace OpenSim.Data.SQLite | |||
1535 | row["ClickAction"] = prim.ClickAction; | 1535 | row["ClickAction"] = prim.ClickAction; |
1536 | 1536 | ||
1537 | row["SalePrice"] = prim.SalePrice; | 1537 | row["SalePrice"] = prim.SalePrice; |
1538 | row["Material"] = prim.Material; | ||
1538 | } | 1539 | } |
1539 | 1540 | ||
1540 | /// <summary> | 1541 | /// <summary> |