aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorUbitUmarov2015-10-20 18:08:04 +0100
committerUbitUmarov2015-10-20 18:08:04 +0100
commit3e25430e3ac585884857c2632d7d2423f37b2116 (patch)
tree25e467bae34eabee666b2a3aa1d64845df03e104 /OpenSim/Data/SQLite
parent stop using a Vector3 to store 3bits (diff)
downloadopensim-SC_OLD-3e25430e3ac585884857c2632d7d2423f37b2116.zip
opensim-SC_OLD-3e25430e3ac585884857c2632d7d2423f37b2116.tar.gz
opensim-SC_OLD-3e25430e3ac585884857c2632d7d2423f37b2116.tar.bz2
opensim-SC_OLD-3e25430e3ac585884857c2632d7d2423f37b2116.tar.xz
store rotation axis locks in MySql and SQlite dbs ( others need to be updated also
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/Resources/RegionStore.migrations10
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs3
2 files changed, 11 insertions, 2 deletions
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;
625ALTER TABLE `land` ADD COLUMN `AnyAVSounds` BOOLEAN NOT NULL DEFAULT TRUE; 625ALTER TABLE `land` ADD COLUMN `AnyAVSounds` BOOLEAN NOT NULL DEFAULT TRUE;
626ALTER TABLE `land` ADD COLUMN `GroupAVSounds` BOOLEAN NOT NULL DEFAULT TRUE; 626ALTER TABLE `land` ADD COLUMN `GroupAVSounds` BOOLEAN NOT NULL DEFAULT TRUE;
627 627
628COMMIT; \ No newline at end of file 628COMMIT;
629
630:VERSION 32 #---- Rotation axis locks
631
632BEGIN;
633
634ALTER TABLE prims ADD COLUMN `RotationAxisLocks` tinyint(4) NOT NULL default '0';
635
636COMMIT;
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();