diff options
author | teravus | 2012-11-15 09:46:41 -0500 |
---|---|---|
committer | teravus | 2012-11-15 09:46:41 -0500 |
commit | dfac269032300872c4d0dc507f4f9062d102b0f4 (patch) | |
tree | d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Data/SQLite | |
parent | * Fixes mesh loading issues in last commit. (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz |
Merge master into teravuswork
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 431709f..42cd59d 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -1366,6 +1366,13 @@ namespace OpenSim.Data.SQLite | |||
1366 | createCol(land, "UserLookAtZ", typeof(Double)); | 1366 | createCol(land, "UserLookAtZ", typeof(Double)); |
1367 | createCol(land, "AuthbuyerID", typeof(String)); | 1367 | createCol(land, "AuthbuyerID", typeof(String)); |
1368 | createCol(land, "OtherCleanTime", typeof(Int32)); | 1368 | createCol(land, "OtherCleanTime", typeof(Int32)); |
1369 | createCol(land, "Dwell", typeof(Int32)); | ||
1370 | createCol(land, "MediaType", typeof(String)); | ||
1371 | createCol(land, "MediaDescription", typeof(String)); | ||
1372 | createCol(land, "MediaSize", typeof(String)); | ||
1373 | createCol(land, "MediaLoop", typeof(Boolean)); | ||
1374 | createCol(land, "ObscureMedia", typeof(Boolean)); | ||
1375 | createCol(land, "ObscureMusic", typeof(Boolean)); | ||
1369 | 1376 | ||
1370 | land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] }; | 1377 | land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] }; |
1371 | 1378 | ||
@@ -1781,9 +1788,16 @@ namespace OpenSim.Data.SQLite | |||
1781 | newData.PassHours = Convert.ToSingle(row["PassHours"]); | 1788 | newData.PassHours = Convert.ToSingle(row["PassHours"]); |
1782 | newData.PassPrice = Convert.ToInt32(row["PassPrice"]); | 1789 | newData.PassPrice = Convert.ToInt32(row["PassPrice"]); |
1783 | newData.SnapshotID = (UUID)(String)row["SnapshotUUID"]; | 1790 | newData.SnapshotID = (UUID)(String)row["SnapshotUUID"]; |
1791 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
1792 | newData.MediaType = (String)row["MediaType"]; | ||
1793 | newData.MediaDescription = (String)row["MediaDescription"]; | ||
1794 | newData.MediaWidth = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[0]); | ||
1795 | newData.MediaHeight = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[1]); | ||
1796 | newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]); | ||
1797 | newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]); | ||
1798 | newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]); | ||
1784 | try | 1799 | try |
1785 | { | 1800 | { |
1786 | |||
1787 | newData.UserLocation = | 1801 | newData.UserLocation = |
1788 | new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), | 1802 | new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), |
1789 | Convert.ToSingle(row["UserLocationZ"])); | 1803 | Convert.ToSingle(row["UserLocationZ"])); |
@@ -2195,12 +2209,13 @@ namespace OpenSim.Data.SQLite | |||
2195 | row["UserLookAtZ"] = land.UserLookAt.Z; | 2209 | row["UserLookAtZ"] = land.UserLookAt.Z; |
2196 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); | 2210 | row["AuthbuyerID"] = land.AuthBuyerID.ToString(); |
2197 | row["OtherCleanTime"] = land.OtherCleanTime; | 2211 | row["OtherCleanTime"] = land.OtherCleanTime; |
2212 | row["Dwell"] = land.Dwell; | ||
2198 | row["MediaType"] = land.MediaType; | 2213 | row["MediaType"] = land.MediaType; |
2199 | row["MediaDescription"] = land.MediaDescription; | 2214 | row["MediaDescription"] = land.MediaDescription; |
2200 | row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString(); | 2215 | row["MediaSize"] = String.Format("{0},{1}", land.MediaWidth, land.MediaHeight); |
2201 | row["MediaLoop"] = land.MediaLoop.ToString(); | 2216 | row["MediaLoop"] = land.MediaLoop; |
2202 | row["ObscureMusic"] = land.ObscureMusic.ToString(); | 2217 | row["ObscureMusic"] = land.ObscureMusic; |
2203 | row["ObscureMedia"] = land.ObscureMedia.ToString(); | 2218 | row["ObscureMedia"] = land.ObscureMedia; |
2204 | } | 2219 | } |
2205 | 2220 | ||
2206 | /// <summary> | 2221 | /// <summary> |