diff options
author | UbitUmarov | 2015-10-20 18:08:04 +0100 |
---|---|---|
committer | UbitUmarov | 2015-10-20 18:08:04 +0100 |
commit | 3e25430e3ac585884857c2632d7d2423f37b2116 (patch) | |
tree | 25e467bae34eabee666b2a3aa1d64845df03e104 /OpenSim/Data | |
parent | stop using a Vector3 to store 3bits (diff) | |
download | opensim-SC-3e25430e3ac585884857c2632d7d2423f37b2116.zip opensim-SC-3e25430e3ac585884857c2632d7d2423f37b2116.tar.gz opensim-SC-3e25430e3ac585884857c2632d7d2423f37b2116.tar.bz2 opensim-SC-3e25430e3ac585884857c2632d7d2423f37b2116.tar.xz |
store rotation axis locks in MySql and SQlite dbs ( others need to be updated also
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 8 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Resources/RegionStore.migrations | 10 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 |
4 files changed, 26 insertions, 5 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index a62d347..46364a5 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -187,7 +187,8 @@ namespace OpenSim.Data.MySQL | |||
187 | "LinkNumber, MediaURL, KeyframeMotion, AttachedPosX, " + | 187 | "LinkNumber, MediaURL, KeyframeMotion, AttachedPosX, " + |
188 | "AttachedPosY, AttachedPosZ, " + | 188 | "AttachedPosY, AttachedPosZ, " + |
189 | "PhysicsShapeType, Density, GravityModifier, " + | 189 | "PhysicsShapeType, Density, GravityModifier, " + |
190 | "Friction, Restitution, Vehicle, DynAttrs " + | 190 | "Friction, Restitution, Vehicle, DynAttrs, " + |
191 | "RotationAxisLocks" + | ||
191 | ") values (" + "?UUID, " + | 192 | ") values (" + "?UUID, " + |
192 | "?CreationDate, ?Name, ?Text, " + | 193 | "?CreationDate, ?Name, ?Text, " + |
193 | "?Description, ?SitName, ?TouchName, " + | 194 | "?Description, ?SitName, ?TouchName, " + |
@@ -223,7 +224,8 @@ namespace OpenSim.Data.MySQL | |||
223 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, ?AttachedPosX, " + | 224 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, ?AttachedPosX, " + |
224 | "?AttachedPosY, ?AttachedPosZ, " + | 225 | "?AttachedPosY, ?AttachedPosZ, " + |
225 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + | 226 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + |
226 | "?Friction, ?Restitution, ?Vehicle, ?DynAttrs)"; | 227 | "?Friction, ?Restitution, ?Vehicle, ?DynAttrs," + |
228 | "?RotationAxisLocks)"; | ||
227 | 229 | ||
228 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); | 230 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); |
229 | 231 | ||
@@ -1353,7 +1355,8 @@ namespace OpenSim.Data.MySQL | |||
1353 | prim.GravityModifier = (float)(double)row["GravityModifier"]; | 1355 | prim.GravityModifier = (float)(double)row["GravityModifier"]; |
1354 | prim.Friction = (float)(double)row["Friction"]; | 1356 | prim.Friction = (float)(double)row["Friction"]; |
1355 | prim.Restitution = (float)(double)row["Restitution"]; | 1357 | prim.Restitution = (float)(double)row["Restitution"]; |
1356 | 1358 | prim.RotationAxisLocks = (byte)Convert.ToInt32(row["RotationAxisLocks"].ToString()); | |
1359 | |||
1357 | SOPVehicle vehicle = null; | 1360 | SOPVehicle vehicle = null; |
1358 | 1361 | ||
1359 | if (row["Vehicle"].ToString() != String.Empty) | 1362 | if (row["Vehicle"].ToString() != String.Empty) |
@@ -1735,6 +1738,7 @@ namespace OpenSim.Data.MySQL | |||
1735 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); | 1738 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); |
1736 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); | 1739 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); |
1737 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution); | 1740 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution); |
1741 | cmd.Parameters.AddWithValue("RotationAxisLocks", prim.RotationAxisLocks); | ||
1738 | } | 1742 | } |
1739 | 1743 | ||
1740 | /// <summary> | 1744 | /// <summary> |
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index e74f9de..a3d4b5d 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -962,3 +962,11 @@ ALTER TABLE `land` ADD COLUMN `GroupAVSounds` tinyint(4) NOT NULL default '1'; | |||
962 | 962 | ||
963 | COMMIT; | 963 | COMMIT; |
964 | 964 | ||
965 | :VERSION 52 #---- STATUS ROTATION axis locks | ||
966 | |||
967 | BEGIN; | ||
968 | |||
969 | ALTER TABLE `prims` ADD COLUMN `RotationAxisLocks` tinyint(4) NOT NULL default '0'; | ||
970 | |||
971 | COMMIT; | ||
972 | |||
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations index 81c868a..f66be34 100644 --- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations +++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations | |||
@@ -625,4 +625,12 @@ ALTER TABLE `land` ADD COLUMN `SeeAVs` BOOLEAN NOT NULL DEFAULT TRUE; | |||
625 | ALTER TABLE `land` ADD COLUMN `AnyAVSounds` BOOLEAN NOT NULL DEFAULT TRUE; | 625 | ALTER TABLE `land` ADD COLUMN `AnyAVSounds` BOOLEAN NOT NULL DEFAULT TRUE; |
626 | ALTER TABLE `land` ADD COLUMN `GroupAVSounds` BOOLEAN NOT NULL DEFAULT TRUE; | 626 | ALTER TABLE `land` ADD COLUMN `GroupAVSounds` BOOLEAN NOT NULL DEFAULT TRUE; |
627 | 627 | ||
628 | COMMIT; \ No newline at end of file | 628 | COMMIT; |
629 | |||
630 | :VERSION 32 #---- Rotation axis locks | ||
631 | |||
632 | BEGIN; | ||
633 | |||
634 | ALTER TABLE prims ADD COLUMN `RotationAxisLocks` tinyint(4) NOT NULL default '0'; | ||
635 | |||
636 | COMMIT; | ||
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 9055218..d7b3bbe 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -1764,6 +1764,7 @@ namespace OpenSim.Data.SQLite | |||
1764 | 1764 | ||
1765 | prim.PassCollisions = Convert.ToBoolean(row["PassCollisions"]); | 1765 | prim.PassCollisions = Convert.ToBoolean(row["PassCollisions"]); |
1766 | prim.PassTouches = Convert.ToBoolean(row["PassTouches"]); | 1766 | prim.PassTouches = Convert.ToBoolean(row["PassTouches"]); |
1767 | prim.RotationAxisLocks = Convert.ToByte(row["RotationAxisLocks"]); | ||
1767 | 1768 | ||
1768 | SOPVehicle vehicle = null; | 1769 | SOPVehicle vehicle = null; |
1769 | if (!(row["Vehicle"] is DBNull) && row["Vehicle"].ToString() != String.Empty) | 1770 | if (!(row["Vehicle"] is DBNull) && row["Vehicle"].ToString() != String.Empty) |
@@ -2185,9 +2186,9 @@ namespace OpenSim.Data.SQLite | |||
2185 | else | 2186 | else |
2186 | row["KeyframeMotion"] = new Byte[0]; | 2187 | row["KeyframeMotion"] = new Byte[0]; |
2187 | 2188 | ||
2188 | |||
2189 | row["PassTouches"] = prim.PassTouches; | 2189 | row["PassTouches"] = prim.PassTouches; |
2190 | row["PassCollisions"] = prim.PassCollisions; | 2190 | row["PassCollisions"] = prim.PassCollisions; |
2191 | row["RotationAxisLocks"] = prim.RotationAxisLocks; | ||
2191 | 2192 | ||
2192 | if (prim.VehicleParams != null) | 2193 | if (prim.VehicleParams != null) |
2193 | row["Vehicle"] = prim.VehicleParams.ToXml2(); | 2194 | row["Vehicle"] = prim.VehicleParams.ToXml2(); |