diff options
author | UbitUmarov | 2018-11-25 18:56:38 +0000 |
---|---|---|
committer | UbitUmarov | 2018-11-25 18:56:38 +0000 |
commit | cded99626595dba9f15ad5485cf2fe1260c3266f (patch) | |
tree | f009cf3b84a56be880a919c30fe4ed13a5004bf3 /OpenSim/Framework | |
parent | avoid data references stuck in packet pools (diff) | |
download | opensim-SC-cded99626595dba9f15ad5485cf2fe1260c3266f.zip opensim-SC-cded99626595dba9f15ad5485cf2fe1260c3266f.tar.gz opensim-SC-cded99626595dba9f15ad5485cf2fe1260c3266f.tar.bz2 opensim-SC-cded99626595dba9f15ad5485cf2fe1260c3266f.tar.xz |
remove a dev only conditional on lludp handlers; change parcel lists updates a bit;
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/ILandObject.cs | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index f8bf583..1c042c4 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -182,10 +182,8 @@ namespace OpenSim.Framework | |||
182 | public delegate void ParcelAccessListRequest( | 182 | public delegate void ParcelAccessListRequest( |
183 | UUID agentID, UUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client); | 183 | UUID agentID, UUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client); |
184 | 184 | ||
185 | public delegate void ParcelAccessListUpdateRequest(UUID agentID, uint flags, | 185 | public delegate void ParcelAccessListUpdateRequest(UUID agentID, uint flags, UUID transactionID, |
186 | int landLocalID, UUID transactionID, int sequenceID, | 186 | int landLocalID, List<LandAccessEntry> entries, IClientAPI remote_client); |
187 | int sections, List<LandAccessEntry> entries, | ||
188 | IClientAPI remote_client); | ||
189 | 187 | ||
190 | public delegate void ParcelPropertiesRequest( | 188 | public delegate void ParcelPropertiesRequest( |
191 | int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); | 189 | int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); |
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs index a783256..1f39482 100644 --- a/OpenSim/Framework/ILandObject.cs +++ b/OpenSim/Framework/ILandObject.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Framework | |||
85 | void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client); | 85 | void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client); |
86 | List<LandAccessEntry> CreateAccessListArrayByFlag(AccessList flag); | 86 | List<LandAccessEntry> CreateAccessListArrayByFlag(AccessList flag); |
87 | void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); | 87 | void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); |
88 | void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, List<LandAccessEntry> entries, IClientAPI remote_client); | 88 | void UpdateAccessList(uint flags, UUID transationID, List<LandAccessEntry> entries); |
89 | void UpdateLandBitmapByteArray(); | 89 | void UpdateLandBitmapByteArray(); |
90 | void SetLandBitmapFromByteArray(); | 90 | void SetLandBitmapFromByteArray(); |
91 | bool[,] GetLandBitmap(); | 91 | bool[,] GetLandBitmap(); |