diff options
| author | Melanie | 2012-02-02 23:40:56 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-02 23:40:56 +0000 |
| commit | 447a66d66005c5ec54a786d1d0a532738729251c (patch) | |
| tree | 78c286a7c43586e7ce0747bd71369c3a3be344df /OpenSim/Region/OptionalModules | |
| parent | OpenID: server connector had a copy-and-paste error that made identity querie... (diff) | |
| download | opensim-SC-447a66d66005c5ec54a786d1d0a532738729251c.zip opensim-SC-447a66d66005c5ec54a786d1d0a532738729251c.tar.gz opensim-SC-447a66d66005c5ec54a786d1d0a532738729251c.tar.bz2 opensim-SC-447a66d66005c5ec54a786d1d0a532738729251c.tar.xz | |
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index bbf3729..11f927c 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1253,7 +1253,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1253 | 1253 | ||
| 1254 | } | 1254 | } |
| 1255 | 1255 | ||
| 1256 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) | 1256 | public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID) |
| 1257 | { | 1257 | { |
| 1258 | 1258 | ||
| 1259 | } | 1259 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 6d40a92..81bf9ed 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -940,7 +940,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 940 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 940 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
| 941 | { | 941 | { |
| 942 | } | 942 | } |
| 943 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) | 943 | public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID) |
| 944 | { | 944 | { |
| 945 | } | 945 | } |
| 946 | public void SendForceClientSelectObjects(List<uint> objectIDs) | 946 | public void SendForceClientSelectObjects(List<uint> objectIDs) |