diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Framework/ILandObject.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/ILandObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs index 8465c86..db1496c 100644 --- a/OpenSim/Framework/ILandObject.cs +++ b/OpenSim/Framework/ILandObject.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Framework | |||
| 68 | void SendLandUpdateToAvatarsOverMe(); | 68 | void SendLandUpdateToAvatarsOverMe(); |
| 69 | 69 | ||
| 70 | void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client); | 70 | void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client); |
| 71 | void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client); | 71 | bool UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client, out bool snap_selection, out bool needOverlay); |
| 72 | bool IsEitherBannedOrRestricted(UUID avatar); | 72 | bool IsEitherBannedOrRestricted(UUID avatar); |
| 73 | bool IsBannedFromLand(UUID avatar); | 73 | bool IsBannedFromLand(UUID avatar); |
| 74 | bool CanBeOnThisLand(UUID avatar, float posHeight); | 74 | bool CanBeOnThisLand(UUID avatar, float posHeight); |