diff options
author | Charles Krinke | 2008-11-19 18:30:16 +0000 |
---|---|---|
committer | Charles Krinke | 2008-11-19 18:30:16 +0000 |
commit | 44c56a974c428379ebf82386aac7b7443fd82a7d (patch) | |
tree | 5b22c54174a6489563cd2ac79162ada4c6f79ba3 /OpenSim/Data/SQLite | |
parent | Adjust to the Helpers->Utils rename (diff) | |
download | opensim-SC-44c56a974c428379ebf82386aac7b7443fd82a7d.zip opensim-SC-44c56a974c428379ebf82386aac7b7443fd82a7d.tar.gz opensim-SC-44c56a974c428379ebf82386aac7b7443fd82a7d.tar.bz2 opensim-SC-44c56a974c428379ebf82386aac7b7443fd82a7d.tar.xz |
Mantis#2656. Thank you kindly, Nlin for a patch that:
Attached patch implements llCollisionSound. Thanks T. Sado.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/Resources/015_RegionStore.sql | 6 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/Resources/015_RegionStore.sql b/OpenSim/Data/SQLite/Resources/015_RegionStore.sql new file mode 100644 index 0000000..f9c0eea --- /dev/null +++ b/OpenSim/Data/SQLite/Resources/015_RegionStore.sql | |||
@@ -0,0 +1,6 @@ | |||
1 | BEGIN; | ||
2 | |||
3 | ALTER TABLE prims ADD COLUMN CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000'; | ||
4 | ALTER TABLE prims ADD COLUMN CollisionSoundVolume float NOT NULL default 0; | ||
5 | |||
6 | COMMIT; | ||
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 4ce343a..a959d56 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -877,6 +877,9 @@ namespace OpenSim.Data.SQLite | |||
877 | 877 | ||
878 | createCol(prims, "Material", typeof(Byte)); | 878 | createCol(prims, "Material", typeof(Byte)); |
879 | 879 | ||
880 | createCol(prims, "CollisionSound", typeof(String)); | ||
881 | createCol(prims, "CollisionSoundVolume", typeof(Double)); | ||
882 | |||
880 | // Add in contraints | 883 | // Add in contraints |
881 | prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]}; | 884 | prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]}; |
882 | 885 | ||
@@ -1237,6 +1240,10 @@ namespace OpenSim.Data.SQLite | |||
1237 | prim.ObjectSaleType = Convert.ToByte(row["SaleType"]); | 1240 | prim.ObjectSaleType = Convert.ToByte(row["SaleType"]); |
1238 | 1241 | ||
1239 | prim.Material = Convert.ToByte(row["Material"]); | 1242 | prim.Material = Convert.ToByte(row["Material"]); |
1243 | |||
1244 | prim.CollisionSound = new UUID(row["CollisionSound"].ToString()); | ||
1245 | prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]); | ||
1246 | |||
1240 | return prim; | 1247 | return prim; |
1241 | } | 1248 | } |
1242 | 1249 | ||
@@ -1564,6 +1571,9 @@ namespace OpenSim.Data.SQLite | |||
1564 | 1571 | ||
1565 | row["SalePrice"] = prim.SalePrice; | 1572 | row["SalePrice"] = prim.SalePrice; |
1566 | row["Material"] = prim.Material; | 1573 | row["Material"] = prim.Material; |
1574 | |||
1575 | row["CollisionSound"] = prim.CollisionSound.ToString(); | ||
1576 | row["CollisionSoundVolume"] = prim.CollisionSoundVolume; | ||
1567 | } | 1577 | } |
1568 | 1578 | ||
1569 | /// <summary> | 1579 | /// <summary> |