aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLRegionData.cs
diff options
context:
space:
mode:
authorDr Scofield2009-05-25 11:26:36 +0000
committerDr Scofield2009-05-25 11:26:36 +0000
commit0bff818d39617f9aa1a8146fc2ad9bc15efb4698 (patch)
treefdf92e47c2b84ac1b4369378f51744747243e056 /OpenSim/Data/MySQL/MySQLRegionData.cs
parentconverting CapabilitiesModule to new region module scheme (diff)
downloadopensim-SC_OLD-0bff818d39617f9aa1a8146fc2ad9bc15efb4698.zip
opensim-SC_OLD-0bff818d39617f9aa1a8146fc2ad9bc15efb4698.tar.gz
opensim-SC_OLD-0bff818d39617f9aa1a8146fc2ad9bc15efb4698.tar.bz2
opensim-SC_OLD-0bff818d39617f9aa1a8146fc2ad9bc15efb4698.tar.xz
From: Chris Yeoh <cyeoh@au1.ibm.com>
The attached patch implements llPassTouches. It has been added to the export/import XML along with the flag for AllowedInventoryDrop. The MySQL backend has been updated as well, though I haven't done one of those before so could do with a check. I added the migration mysql file as well. The other data backends need updating as well.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index b13813f..8a24fec 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -196,6 +196,7 @@ namespace OpenSim.Data.MySQL
196 "ColorR, ColorG, ColorB, ColorA, "+ 196 "ColorR, ColorG, ColorB, ColorA, "+
197 "ParticleSystem, ClickAction, Material, "+ 197 "ParticleSystem, ClickAction, Material, "+
198 "CollisionSound, CollisionSoundVolume, "+ 198 "CollisionSound, CollisionSoundVolume, "+
199 "PassTouches, "+
199 "LinkNumber) values (" + "?UUID, "+ 200 "LinkNumber) values (" + "?UUID, "+
200 "?CreationDate, ?Name, ?Text, "+ 201 "?CreationDate, ?Name, ?Text, "+
201 "?Description, ?SitName, ?TouchName, "+ 202 "?Description, ?SitName, ?TouchName, "+
@@ -227,7 +228,7 @@ namespace OpenSim.Data.MySQL
227 "?SaleType, ?ColorR, ?ColorG, "+ 228 "?SaleType, ?ColorR, ?ColorG, "+
228 "?ColorB, ?ColorA, ?ParticleSystem, "+ 229 "?ColorB, ?ColorA, ?ParticleSystem, "+
229 "?ClickAction, ?Material, ?CollisionSound, "+ 230 "?ClickAction, ?Material, ?CollisionSound, "+
230 "?CollisionSoundVolume, ?LinkNumber)"; 231 "?CollisionSoundVolume, ?PassTouches, ?LinkNumber)";
231 232
232 FillPrimCommand(cmd, prim, obj.UUID, regionUUID); 233 FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
233 234
@@ -950,6 +951,9 @@ namespace OpenSim.Data.MySQL
950 951
951 prim.CollisionSound = new UUID(row["CollisionSound"].ToString()); 952 prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
952 prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]); 953 prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
954
955 if (Convert.ToInt16(row["PassTouches"]) != 0)
956 prim.PassTouches = true;
953 prim.LinkNum = Convert.ToInt32(row["LinkNumber"]); 957 prim.LinkNum = Convert.ToInt32(row["LinkNumber"]);
954 958
955 return prim; 959 return prim;
@@ -1272,6 +1276,12 @@ namespace OpenSim.Data.MySQL
1272 1276
1273 cmd.Parameters.AddWithValue("CollisionSound", prim.CollisionSound.ToString()); 1277 cmd.Parameters.AddWithValue("CollisionSound", prim.CollisionSound.ToString());
1274 cmd.Parameters.AddWithValue("CollisionSoundVolume", prim.CollisionSoundVolume); 1278 cmd.Parameters.AddWithValue("CollisionSoundVolume", prim.CollisionSoundVolume);
1279
1280 if (prim.PassTouches)
1281 cmd.Parameters.AddWithValue("PassTouches", 1);
1282 else
1283 cmd.Parameters.AddWithValue("PassTouches", 0);
1284
1275 cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); 1285 cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
1276 } 1286 }
1277 1287
@@ -1534,4 +1544,4 @@ namespace OpenSim.Data.MySQL
1534 } 1544 }
1535 } 1545 }
1536 } 1546 }
1537} \ No newline at end of file 1547}