4 files changed, 31 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
             createCol(prims, "ClickAction", typeof (Byte));
             createCol(prims, "Material", typeof (Byte));
 
+            createCol(prims, "CollisionSound", typeof(String));
+            createCol(prims, "CollisionSoundVolume", typeof(Double));
+
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]};
 
@@ -1271,6 +1274,9 @@ namespace OpenSim.Data.MySQL
             if (!row.IsNull("ClickAction"))
                 prim.ClickAction = Convert.ToByte(row["ClickAction"]);
 
+            prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
+            prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
+
             return prim;
         }
 
@@ -1589,6 +1595,9 @@ namespace OpenSim.Data.MySQL
             row["ClickAction"] = clickAction;
 
             row["Material"] = prim.Material;
+
+            row["CollisionSound"] = prim.CollisionSound.ToString();
+            row["CollisionSoundVolume"] = prim.CollisionSoundVolume;
         }
 
         /// <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 @@
+BEGIN;

+

+ALTER TABLE prims ADD COLUMN CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000';

+ALTER TABLE prims ADD COLUMN CollisionSoundVolume float not null default 0.0;

+

+COMMIT;

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 @@
+BEGIN;

+

+ALTER TABLE prims ADD COLUMN CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';

+ALTER TABLE prims ADD COLUMN CollisionSoundVolume float NOT NULL default 0;

+

+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
 
             createCol(prims, "Material", typeof(Byte));
 
+            createCol(prims, "CollisionSound", typeof(String));
+            createCol(prims, "CollisionSoundVolume", typeof(Double));
+
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] {prims.Columns["UUID"]};
 
@@ -1237,6 +1240,10 @@ namespace OpenSim.Data.SQLite
             prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
 
             prim.Material = Convert.ToByte(row["Material"]);
+
+            prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
+            prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
+
             return prim;
         }
 
@@ -1564,6 +1571,9 @@ namespace OpenSim.Data.SQLite
 
             row["SalePrice"] = prim.SalePrice;
             row["Material"] = prim.Material;
+
+            row["CollisionSound"] = prim.CollisionSound.ToString();
+            row["CollisionSoundVolume"] = prim.CollisionSoundVolume;
         }
 
         /// <summary>