From 44c56a974c428379ebf82386aac7b7443fd82a7d Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Wed, 19 Nov 2008 18:30:16 +0000
Subject: Mantis#2656. Thank you kindly, Nlin for a patch that: Attached patch
 implements llCollisionSound. Thanks T. Sado.

---
 OpenSim/Data/SQLite/Resources/015_RegionStore.sql |  6 ++++++
 OpenSim/Data/SQLite/SQLiteRegionData.cs           | 10 ++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 OpenSim/Data/SQLite/Resources/015_RegionStore.sql

(limited to 'OpenSim/Data/SQLite')

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>
-- 
cgit v1.1