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/MySQL | |
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 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 9 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/022_RegionStore.sql | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index effe10b..1daefe4 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
@@ -981,6 +981,9 @@ namespace OpenSim.Data.MySQL | |||
981 | createCol(prims, "ClickAction", typeof (Byte)); | 981 | createCol(prims, "ClickAction", typeof (Byte)); |
982 | createCol(prims, "Material", typeof (Byte)); | 982 | createCol(prims, "Material", typeof (Byte)); |
983 | 983 | ||
984 | createCol(prims, "CollisionSound", typeof(String)); | ||
985 | createCol(prims, "CollisionSoundVolume", typeof(Double)); | ||
986 | |||
984 | // Add in contraints | 987 | // Add in contraints |
985 | prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]}; | 988 | prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]}; |
986 | 989 | ||
@@ -1271,6 +1274,9 @@ namespace OpenSim.Data.MySQL | |||
1271 | if (!row.IsNull("ClickAction")) | 1274 | if (!row.IsNull("ClickAction")) |
1272 | prim.ClickAction = Convert.ToByte(row["ClickAction"]); | 1275 | prim.ClickAction = Convert.ToByte(row["ClickAction"]); |
1273 | 1276 | ||
1277 | prim.CollisionSound = new UUID(row["CollisionSound"].ToString()); | ||
1278 | prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]); | ||
1279 | |||
1274 | return prim; | 1280 | return prim; |
1275 | } | 1281 | } |
1276 | 1282 | ||
@@ -1589,6 +1595,9 @@ namespace OpenSim.Data.MySQL | |||
1589 | row["ClickAction"] = clickAction; | 1595 | row["ClickAction"] = clickAction; |
1590 | 1596 | ||
1591 | row["Material"] = prim.Material; | 1597 | row["Material"] = prim.Material; |
1598 | |||
1599 | row["CollisionSound"] = prim.CollisionSound.ToString(); | ||
1600 | row["CollisionSoundVolume"] = prim.CollisionSoundVolume; | ||
1592 | } | 1601 | } |
1593 | 1602 | ||
1594 | /// <summary> | 1603 | /// <summary> |
diff --git a/OpenSim/Data/MySQL/Resources/022_RegionStore.sql b/OpenSim/Data/MySQL/Resources/022_RegionStore.sql new file mode 100644 index 0000000..af4fdce --- /dev/null +++ b/OpenSim/Data/MySQL/Resources/022_RegionStore.sql | |||
@@ -0,0 +1,6 @@ | |||
1 | BEGIN; | ||
2 | |||
3 | ALTER TABLE prims ADD COLUMN CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000'; | ||
4 | ALTER TABLE prims ADD COLUMN CollisionSoundVolume float not null default 0.0; | ||
5 | |||
6 | COMMIT; | ||