diff options
author | Melanie Thielker | 2008-10-18 05:51:36 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-18 05:51:36 +0000 |
commit | efe3f3eb2a0a31b1da474974c7d8193c2b28e13f (patch) | |
tree | df1d30ad2f9230ea4e8fbfd1e6368d539600c785 /OpenSim/Data/MySQL/MySQLRegionData.cs | |
parent | * Fix an over compensation for bounciness on flat Primitive (diff) | |
download | opensim-SC-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.zip opensim-SC-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.gz opensim-SC-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.bz2 opensim-SC-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.xz |
Megapatch. :) Fix skull attachment editing. Streamline Object terse updates.
Add rezzing time to objects. Add Object return and traffic fields to land
database. Add plumbing for auto return. Implement auto return.
Contains a migration. May contain nuts.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLRegionData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index ae048fe..ab7e92d 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
@@ -994,6 +994,8 @@ namespace OpenSim.Data.MySQL | |||
994 | createCol(land, "UserLookAtY", typeof (Double)); | 994 | createCol(land, "UserLookAtY", typeof (Double)); |
995 | createCol(land, "UserLookAtZ", typeof (Double)); | 995 | createCol(land, "UserLookAtZ", typeof (Double)); |
996 | createCol(land, "AuthBuyerID", typeof (String)); | 996 | createCol(land, "AuthBuyerID", typeof (String)); |
997 | createCol(land, "OtherCleanTime", typeof(Int32)); | ||
998 | createCol(land, "Dwell", typeof(Int32)); | ||
997 | 999 | ||
998 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; | 1000 | land.PrimaryKey = new DataColumn[] {land.Columns["UUID"]}; |
999 | 1001 | ||
@@ -1357,6 +1359,8 @@ namespace OpenSim.Data.MySQL | |||
1357 | 1359 | ||
1358 | UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer); | 1360 | UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer); |
1359 | UUID.TryParse((string)row["SnapshotUUID"], out snapshotID); | 1361 | UUID.TryParse((string)row["SnapshotUUID"], out snapshotID); |
1362 | newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]); | ||
1363 | newData.Dwell = Convert.ToInt32(row["Dwell"]); | ||
1360 | 1364 | ||
1361 | newData.AuthBuyerID = authedbuyer; | 1365 | newData.AuthBuyerID = authedbuyer; |
1362 | newData.SnapshotID = snapshotID; | 1366 | newData.SnapshotID = snapshotID; |
@@ -1661,6 +1665,8 @@ namespace OpenSim.Data.MySQL | |||
1661 | row["UserLookAtY"] = land.UserLookAt.Y; | 1665 | row["UserLookAtY"] = land.UserLookAt.Y; |
1662 | row["UserLookAtZ"] = land.UserLookAt.Z; | 1666 | row["UserLookAtZ"] = land.UserLookAt.Z; |
1663 | row["AuthBuyerID"] = land.AuthBuyerID; | 1667 | row["AuthBuyerID"] = land.AuthBuyerID; |
1668 | row["OtherCleanTime"] = land.OtherCleanTime; | ||
1669 | row["Dwell"] = land.Dwell; | ||
1664 | } | 1670 | } |
1665 | 1671 | ||
1666 | /// <summary> | 1672 | /// <summary> |