aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteSimulationData.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs46
1 files changed, 41 insertions, 5 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 6ed3d40..d7b3bbe 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1246,6 +1246,7 @@ namespace OpenSim.Data.SQLite
1246 createCol(prims, "Restitution", typeof(Double)); 1246 createCol(prims, "Restitution", typeof(Double));
1247 1247
1248 createCol(prims, "KeyframeMotion", typeof(Byte[])); 1248 createCol(prims, "KeyframeMotion", typeof(Byte[]));
1249
1249 // Add in contraints 1250 // Add in contraints
1250 prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] }; 1251 prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
1251 1252
@@ -1760,7 +1761,18 @@ namespace OpenSim.Data.SQLite
1760 { 1761 {
1761 prim.KeyframeMotion = null; 1762 prim.KeyframeMotion = null;
1762 } 1763 }
1763 1764
1765 prim.PassCollisions = Convert.ToBoolean(row["PassCollisions"]);
1766 prim.PassTouches = Convert.ToBoolean(row["PassTouches"]);
1767 prim.RotationAxisLocks = Convert.ToByte(row["RotationAxisLocks"]);
1768
1769 SOPVehicle vehicle = null;
1770 if (!(row["Vehicle"] is DBNull) && row["Vehicle"].ToString() != String.Empty)
1771 {
1772 vehicle = SOPVehicle.FromXml2(row["Vehicle"].ToString());
1773 if (vehicle != null)
1774 prim.VehicleParams = vehicle;
1775 }
1764 return prim; 1776 return prim;
1765 } 1777 }
1766 1778
@@ -1845,6 +1857,10 @@ namespace OpenSim.Data.SQLite
1845 newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]); 1857 newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
1846 newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]); 1858 newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
1847 newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]); 1859 newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
1860 newData.SeeAVs = Convert.ToBoolean(row["SeeAVs"]);
1861 newData.AnyAVSounds = Convert.ToBoolean(row["AnyAVSounds"]);
1862 newData.GroupAVSounds = Convert.ToBoolean(row["GroupAVSounds"]);
1863
1848 try 1864 try
1849 { 1865 {
1850 newData.UserLocation = 1866 newData.UserLocation =
@@ -1918,7 +1934,8 @@ namespace OpenSim.Data.SQLite
1918 newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]); 1934 newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]);
1919 newSettings.TelehubObject = new UUID((String)row["TelehubObject"]); 1935 newSettings.TelehubObject = new UUID((String)row["TelehubObject"]);
1920 newSettings.ParcelImageID = new UUID((String)row["parcel_tile_ID"]); 1936 newSettings.ParcelImageID = new UUID((String)row["parcel_tile_ID"]);
1921 1937 newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
1938 newSettings.Casino = Convert.ToBoolean(row["casino"]);
1922 return newSettings; 1939 return newSettings;
1923 } 1940 }
1924 1941
@@ -2013,6 +2030,7 @@ namespace OpenSim.Data.SQLite
2013 return entry; 2030 return entry;
2014 } 2031 }
2015 2032
2033
2016 /// <summary> 2034 /// <summary>
2017 /// 2035 ///
2018 /// </summary> 2036 /// </summary>
@@ -2137,7 +2155,6 @@ namespace OpenSim.Data.SQLite
2137 // click action 2155 // click action
2138 row["ClickAction"] = prim.ClickAction; 2156 row["ClickAction"] = prim.ClickAction;
2139 2157
2140 row["SalePrice"] = prim.SalePrice;
2141 row["Material"] = prim.Material; 2158 row["Material"] = prim.Material;
2142 2159
2143 row["CollisionSound"] = prim.CollisionSound.ToString(); 2160 row["CollisionSound"] = prim.CollisionSound.ToString();
@@ -2168,8 +2185,16 @@ namespace OpenSim.Data.SQLite
2168 row["KeyframeMotion"] = prim.KeyframeMotion.Serialize(); 2185 row["KeyframeMotion"] = prim.KeyframeMotion.Serialize();
2169 else 2186 else
2170 row["KeyframeMotion"] = new Byte[0]; 2187 row["KeyframeMotion"] = new Byte[0];
2171 2188
2172 2189 row["PassTouches"] = prim.PassTouches;
2190 row["PassCollisions"] = prim.PassCollisions;
2191 row["RotationAxisLocks"] = prim.RotationAxisLocks;
2192
2193 if (prim.VehicleParams != null)
2194 row["Vehicle"] = prim.VehicleParams.ToXml2();
2195 else
2196 row["Vehicle"] = String.Empty;
2197
2173 } 2198 }
2174 2199
2175 /// <summary> 2200 /// <summary>
@@ -2253,6 +2278,10 @@ namespace OpenSim.Data.SQLite
2253 row["MediaLoop"] = land.MediaLoop; 2278 row["MediaLoop"] = land.MediaLoop;
2254 row["ObscureMusic"] = land.ObscureMusic; 2279 row["ObscureMusic"] = land.ObscureMusic;
2255 row["ObscureMedia"] = land.ObscureMedia; 2280 row["ObscureMedia"] = land.ObscureMedia;
2281 row["SeeAVs"] = land.SeeAVs;
2282 row["AnyAVSounds"] = land.AnyAVSounds;
2283 row["GroupAVSounds"] = land.GroupAVSounds;
2284
2256 } 2285 }
2257 2286
2258 /// <summary> 2287 /// <summary>
@@ -2311,6 +2340,8 @@ namespace OpenSim.Data.SQLite
2311 row["map_tile_ID"] = settings.TerrainImageID.ToString(); 2340 row["map_tile_ID"] = settings.TerrainImageID.ToString();
2312 row["TelehubObject"] = settings.TelehubObject.ToString(); 2341 row["TelehubObject"] = settings.TelehubObject.ToString();
2313 row["parcel_tile_ID"] = settings.ParcelImageID.ToString(); 2342 row["parcel_tile_ID"] = settings.ParcelImageID.ToString();
2343 row["block_search"] = settings.GodBlockSearch;
2344 row["casino"] = settings.Casino;
2314 } 2345 }
2315 2346
2316 /// <summary> 2347 /// <summary>
@@ -2944,6 +2975,11 @@ namespace OpenSim.Data.SQLite
2944 } 2975 }
2945 } 2976 }
2946 2977
2978 public UUID[] GetObjectIDs(UUID regionID)
2979 {
2980 return new UUID[0];
2981 }
2982
2947 public void SaveExtra(UUID regionID, string name, string value) 2983 public void SaveExtra(UUID regionID, string name, string value)
2948 { 2984 {
2949 } 2985 }