diff options
| author | Justin Clark-Casey (justincc) | 2010-12-14 00:12:17 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-12-14 00:12:17 +0000 |
| commit | e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5 (patch) | |
| tree | fc4a33689299573e29ad4bf1e7aa74e821cf68d9 /OpenSim/Framework | |
| parent | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u... (diff) | |
| parent | Fix a small bug in ban list handling (diff) | |
| download | opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.zip opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.gz opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.bz2 opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 027f9c5..b9c9323 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -174,9 +174,10 @@ namespace OpenSim.Framework | |||
| 174 | public delegate void ParcelAccessListRequest( | 174 | public delegate void ParcelAccessListRequest( |
| 175 | UUID agentID, UUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client); | 175 | UUID agentID, UUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client); |
| 176 | 176 | ||
| 177 | public delegate void ParcelAccessListUpdateRequest( | 177 | public delegate void ParcelAccessListUpdateRequest(UUID agentID, uint flags, |
| 178 | UUID agentID, UUID sessionID, uint flags, int landLocalID, List<ParcelManager.ParcelAccessEntry> entries, | 178 | int landLocalID, UUID transactionID, int sequenceID, |
| 179 | IClientAPI remote_client); | 179 | int sections, List<ParcelManager.ParcelAccessEntry> entries, |
| 180 | IClientAPI remote_client); | ||
| 180 | 181 | ||
| 181 | public delegate void ParcelPropertiesRequest( | 182 | public delegate void ParcelPropertiesRequest( |
| 182 | int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); | 183 | int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); |