diff options
author | Melanie | 2012-02-02 21:36:45 +0100 |
---|---|---|
committer | Melanie | 2012-02-02 21:36:45 +0100 |
commit | 07c487a28f6ce6d85cf32fba0c2ded724f7b5af7 (patch) | |
tree | 7852ae5fa1c6a9d91f6c5b7930615a45245b694e /OpenSim/Framework/LandData.cs | |
parent | Streamline banning code using existing methods. (diff) | |
download | opensim-SC-07c487a28f6ce6d85cf32fba0c2ded724f7b5af7.zip opensim-SC-07c487a28f6ce6d85cf32fba0c2ded724f7b5af7.tar.gz opensim-SC-07c487a28f6ce6d85cf32fba0c2ded724f7b5af7.tar.bz2 opensim-SC-07c487a28f6ce6d85cf32fba0c2ded724f7b5af7.tar.xz |
Make ban, eject, freeze and the scripted versions of those work.
Diffstat (limited to 'OpenSim/Framework/LandData.cs')
-rw-r--r-- | OpenSim/Framework/LandData.cs | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 282a128..27fadfa 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -34,6 +34,13 @@ using OpenMetaverse; | |||
34 | 34 | ||
35 | namespace OpenSim.Framework | 35 | namespace OpenSim.Framework |
36 | { | 36 | { |
37 | public struct LandAccessEntry | ||
38 | { | ||
39 | public UUID AgentID; | ||
40 | public int Expires; | ||
41 | public AccessList Flags; | ||
42 | } | ||
43 | |||
37 | /// <summary> | 44 | /// <summary> |
38 | /// Details of a Parcel of land | 45 | /// Details of a Parcel of land |
39 | /// </summary> | 46 | /// </summary> |
@@ -73,7 +80,7 @@ namespace OpenSim.Framework | |||
73 | private string _mediaURL = String.Empty; | 80 | private string _mediaURL = String.Empty; |
74 | private string _musicURL = String.Empty; | 81 | private string _musicURL = String.Empty; |
75 | private UUID _ownerID = UUID.Zero; | 82 | private UUID _ownerID = UUID.Zero; |
76 | private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); | 83 | private List<LandAccessEntry> _parcelAccessList = new List<LandAccessEntry>(); |
77 | private float _passHours = 0; | 84 | private float _passHours = 0; |
78 | private int _passPrice = 0; | 85 | private int _passPrice = 0; |
79 | private int _salePrice = 0; //Unemeplemented. Parcels price. | 86 | private int _salePrice = 0; //Unemeplemented. Parcels price. |
@@ -450,7 +457,7 @@ namespace OpenSim.Framework | |||
450 | /// <summary> | 457 | /// <summary> |
451 | /// List of access data for the parcel. User data, some bitflags, and a time | 458 | /// List of access data for the parcel. User data, some bitflags, and a time |
452 | /// </summary> | 459 | /// </summary> |
453 | public List<ParcelManager.ParcelAccessEntry> ParcelAccessList { | 460 | public List<LandAccessEntry> ParcelAccessList { |
454 | get { | 461 | get { |
455 | return _parcelAccessList; | 462 | return _parcelAccessList; |
456 | } | 463 | } |
@@ -638,12 +645,12 @@ namespace OpenSim.Framework | |||
638 | landData._simwidePrims = _simwidePrims; | 645 | landData._simwidePrims = _simwidePrims; |
639 | 646 | ||
640 | landData._parcelAccessList.Clear(); | 647 | landData._parcelAccessList.Clear(); |
641 | foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList) | 648 | foreach (LandAccessEntry entry in _parcelAccessList) |
642 | { | 649 | { |
643 | ParcelManager.ParcelAccessEntry newEntry = new ParcelManager.ParcelAccessEntry(); | 650 | LandAccessEntry newEntry = new LandAccessEntry(); |
644 | newEntry.AgentID = entry.AgentID; | 651 | newEntry.AgentID = entry.AgentID; |
645 | newEntry.Flags = entry.Flags; | 652 | newEntry.Flags = entry.Flags; |
646 | newEntry.Time = entry.Time; | 653 | newEntry.Expires = entry.Expires; |
647 | 654 | ||
648 | landData._parcelAccessList.Add(newEntry); | 655 | landData._parcelAccessList.Add(newEntry); |
649 | } | 656 | } |
@@ -668,4 +675,4 @@ namespace OpenSim.Framework | |||
668 | return land; | 675 | return land; |
669 | } | 676 | } |
670 | } | 677 | } |
671 | } \ No newline at end of file | 678 | } |