diff options
| author | Melanie | 2010-12-13 20:20:02 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-13 20:20:02 +0000 |
| commit | 7538926292ba3380f71f7fb3c004113dd2a92f95 (patch) | |
| tree | 02619821cdb7207b6aae26c01ce6ca29d58ce452 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Revamp the viewer -> banlist packet processing so fix a number of bugs. (diff) | |
| download | opensim-SC_OLD-7538926292ba3380f71f7fb3c004113dd2a92f95.zip opensim-SC_OLD-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.gz opensim-SC_OLD-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.bz2 opensim-SC_OLD-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
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 f8be9ad..1a59cf4 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); |