diff options
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index bb59bba..be60d4c 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs | |||
@@ -681,7 +681,7 @@ VALUES | |||
681 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 681 | using (SqlCommand cmd = new SqlCommand(sql, conn)) |
682 | { | 682 | { |
683 | conn.Open(); | 683 | conn.Open(); |
684 | foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList) | 684 | foreach (LandAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList) |
685 | { | 685 | { |
686 | cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID)); | 686 | cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID)); |
687 | 687 | ||
@@ -1453,7 +1453,7 @@ VALUES | |||
1453 | _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); | 1453 | _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); |
1454 | } | 1454 | } |
1455 | 1455 | ||
1456 | newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); | 1456 | newData.ParcelAccessList = new List<LandAccessEntry>(); |
1457 | 1457 | ||
1458 | return newData; | 1458 | return newData; |
1459 | } | 1459 | } |
@@ -1463,12 +1463,12 @@ VALUES | |||
1463 | /// </summary> | 1463 | /// </summary> |
1464 | /// <param name="row">datarecord with landaccess data</param> | 1464 | /// <param name="row">datarecord with landaccess data</param> |
1465 | /// <returns></returns> | 1465 | /// <returns></returns> |
1466 | private static ParcelManager.ParcelAccessEntry BuildLandAccessData(IDataRecord row) | 1466 | private static LandAccessEntry BuildLandAccessData(IDataRecord row) |
1467 | { | 1467 | { |
1468 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 1468 | LandAccessEntry entry = new LandAccessEntry(); |
1469 | entry.AgentID = new UUID((Guid)row["AccessUUID"]); | 1469 | entry.AgentID = new UUID((Guid)row["AccessUUID"]); |
1470 | entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]); | 1470 | entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]); |
1471 | entry.Time = new DateTime(); | 1471 | entry.Expires = 0; |
1472 | return entry; | 1472 | return entry; |
1473 | } | 1473 | } |
1474 | 1474 | ||
@@ -1851,7 +1851,7 @@ VALUES | |||
1851 | /// <param name="parcelAccessEntry">parcel access entry.</param> | 1851 | /// <param name="parcelAccessEntry">parcel access entry.</param> |
1852 | /// <param name="parcelID">parcel ID.</param> | 1852 | /// <param name="parcelID">parcel ID.</param> |
1853 | /// <returns></returns> | 1853 | /// <returns></returns> |
1854 | private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, UUID parcelID) | 1854 | private SqlParameter[] CreateLandAccessParameters(LandAccessEntry parcelAccessEntry, UUID parcelID) |
1855 | { | 1855 | { |
1856 | List<SqlParameter> parameters = new List<SqlParameter>(); | 1856 | List<SqlParameter> parameters = new List<SqlParameter>(); |
1857 | 1857 | ||