diff options
author | Diva Canto | 2010-12-13 21:36:08 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-13 21:36:08 -0800 |
commit | 4bdba0a48758eff9127c664486df8c02b672f21a (patch) | |
tree | d798cc52162216cf25635ea9efe62c114e9188e5 /OpenSim/Framework/IClientAPI.cs | |
parent | This seems to get rid of the stuck PREJUMP animation, as reported by Justin i... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-4bdba0a48758eff9127c664486df8c02b672f21a.zip opensim-SC-4bdba0a48758eff9127c664486df8c02b672f21a.tar.gz opensim-SC-4bdba0a48758eff9127c664486df8c02b672f21a.tar.bz2 opensim-SC-4bdba0a48758eff9127c664486df8c02b672f21a.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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); |