aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLRegionData.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs14
1 files changed, 2 insertions, 12 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 8a24fec..b13813f 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -196,7 +196,6 @@ 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, "+
200 "LinkNumber) values (" + "?UUID, "+ 199 "LinkNumber) values (" + "?UUID, "+
201 "?CreationDate, ?Name, ?Text, "+ 200 "?CreationDate, ?Name, ?Text, "+
202 "?Description, ?SitName, ?TouchName, "+ 201 "?Description, ?SitName, ?TouchName, "+
@@ -228,7 +227,7 @@ namespace OpenSim.Data.MySQL
228 "?SaleType, ?ColorR, ?ColorG, "+ 227 "?SaleType, ?ColorR, ?ColorG, "+
229 "?ColorB, ?ColorA, ?ParticleSystem, "+ 228 "?ColorB, ?ColorA, ?ParticleSystem, "+
230 "?ClickAction, ?Material, ?CollisionSound, "+ 229 "?ClickAction, ?Material, ?CollisionSound, "+
231 "?CollisionSoundVolume, ?PassTouches, ?LinkNumber)"; 230 "?CollisionSoundVolume, ?LinkNumber)";
232 231
233 FillPrimCommand(cmd, prim, obj.UUID, regionUUID); 232 FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
234 233
@@ -951,9 +950,6 @@ namespace OpenSim.Data.MySQL
951 950
952 prim.CollisionSound = new UUID(row["CollisionSound"].ToString()); 951 prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
953 prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]); 952 prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
954
955 if (Convert.ToInt16(row["PassTouches"]) != 0)
956 prim.PassTouches = true;
957 prim.LinkNum = Convert.ToInt32(row["LinkNumber"]); 953 prim.LinkNum = Convert.ToInt32(row["LinkNumber"]);
958 954
959 return prim; 955 return prim;
@@ -1276,12 +1272,6 @@ namespace OpenSim.Data.MySQL
1276 1272
1277 cmd.Parameters.AddWithValue("CollisionSound", prim.CollisionSound.ToString()); 1273 cmd.Parameters.AddWithValue("CollisionSound", prim.CollisionSound.ToString());
1278 cmd.Parameters.AddWithValue("CollisionSoundVolume", prim.CollisionSoundVolume); 1274 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
1285 cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); 1275 cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
1286 } 1276 }
1287 1277
@@ -1544,4 +1534,4 @@ namespace OpenSim.Data.MySQL
1544 } 1534 }
1545 } 1535 }
1546 } 1536 }
1547} 1537} \ No newline at end of file