diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 5618772..2d06f82 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -759,7 +759,7 @@ namespace OpenSim.Data.SQLite | |||
759 | landaccesslist.Rows.Remove(rowsToDelete[iter]); | 759 | landaccesslist.Rows.Remove(rowsToDelete[iter]); |
760 | } | 760 | } |
761 | rowsToDelete.Clear(); | 761 | rowsToDelete.Clear(); |
762 | foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList) | 762 | foreach (LandAccessEntry entry in parcel.LandData.ParcelAccessList) |
763 | { | 763 | { |
764 | DataRow newAccessRow = landaccesslist.NewRow(); | 764 | DataRow newAccessRow = landaccesslist.NewRow(); |
765 | fillLandAccessRow(newAccessRow, entry, parcel.LandData.GlobalID); | 765 | fillLandAccessRow(newAccessRow, entry, parcel.LandData.GlobalID); |
@@ -1456,7 +1456,7 @@ namespace OpenSim.Data.SQLite | |||
1456 | newData.UserLocation = Vector3.Zero; | 1456 | newData.UserLocation = Vector3.Zero; |
1457 | newData.UserLookAt = Vector3.Zero; | 1457 | newData.UserLookAt = Vector3.Zero; |
1458 | } | 1458 | } |
1459 | newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); | 1459 | newData.ParcelAccessList = new List<LandAccessEntry>(); |
1460 | UUID authBuyerID = UUID.Zero; | 1460 | UUID authBuyerID = UUID.Zero; |
1461 | 1461 | ||
1462 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); | 1462 | UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID); |
@@ -1519,12 +1519,12 @@ namespace OpenSim.Data.SQLite | |||
1519 | /// </summary> | 1519 | /// </summary> |
1520 | /// <param name="row"></param> | 1520 | /// <param name="row"></param> |
1521 | /// <returns></returns> | 1521 | /// <returns></returns> |
1522 | private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) | 1522 | private static LandAccessEntry buildLandAccessData(DataRow row) |
1523 | { | 1523 | { |
1524 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 1524 | LandAccessEntry entry = new LandAccessEntry(); |
1525 | entry.AgentID = new UUID((string) row["AccessUUID"]); | 1525 | entry.AgentID = new UUID((string) row["AccessUUID"]); |
1526 | entry.Flags = (AccessList) row["Flags"]; | 1526 | entry.Flags = (AccessList) row["Flags"]; |
1527 | entry.Time = new DateTime(); | 1527 | entry.Expires = 0; |
1528 | return entry; | 1528 | return entry; |
1529 | } | 1529 | } |
1530 | 1530 | ||
@@ -1787,7 +1787,7 @@ namespace OpenSim.Data.SQLite | |||
1787 | /// <param name="row"></param> | 1787 | /// <param name="row"></param> |
1788 | /// <param name="entry"></param> | 1788 | /// <param name="entry"></param> |
1789 | /// <param name="parcelID"></param> | 1789 | /// <param name="parcelID"></param> |
1790 | private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID) | 1790 | private static void fillLandAccessRow(DataRow row, LandAccessEntry entry, UUID parcelID) |
1791 | { | 1791 | { |
1792 | row["LandUUID"] = parcelID.ToString(); | 1792 | row["LandUUID"] = parcelID.ToString(); |
1793 | row["AccessUUID"] = entry.AgentID.ToString(); | 1793 | row["AccessUUID"] = entry.AgentID.ToString(); |